From ea715e791110c7995b256908551d6e0056d9b5ba Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 21 Oct 2009 21:40:21 +0000 Subject: [PATCH] Refix https://issues.apache.org/bugzilla/show_bug.cgi?id=37848 Don't output info messages if there is no terminal Patch provided by Eric Herman git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@828225 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 6114e0195..bb957d751 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -248,7 +248,9 @@ if [ "$1" = "debug" ] ; then else shift if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi shift exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ @@ -274,7 +276,9 @@ elif [ "$1" = "run" ]; then shift if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi shift exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ @@ -305,7 +309,9 @@ elif [ "$1" = "start" ] ; then shift touch "$CATALINA_BASE"/logs/catalina.out if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi shift "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -- 2.11.0