Author: markt
Date: Wed Oct 21 21:40:21 2009
New Revision: 828225
URL: http://svn.apache.org/viewvc?rev=828225&view=rev
Log:
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
Modified:
tomcat/trunk/bin/catalina.sh
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=828225&r1=828224&r2=828225&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Oct 21 21:40:21 2009
@@ -248,7 +248,9 @@
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 @@
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 @@
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" \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
