Author: yoavs Date: Fri Apr 14 08:25:07 2006 New Revision: 394120 URL: http://svn.apache.org/viewcvs?rev=394120&view=rev Log: Bugzilla 37848: http://issues.apache.org/bugzilla/show_bug.cgi?id=37848
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=394120&r1=394119&r2=394120&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Fri Apr 14 08:25:07 2006 @@ -131,6 +131,12 @@ CATALINA_TMPDIR="$CATALINA_BASE"/temp fi +# Bugzilla 37848: When no TTY is available, don't output to console +have_tty=0 +if [ "`tty`" != "not a tty" ]; then + have_tty=1 +fi + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` @@ -150,13 +156,16 @@ # ----- Execute The Requested Command ----------------------------------------- -echo "Using CATALINA_BASE: $CATALINA_BASE" -echo "Using CATALINA_HOME: $CATALINA_HOME" -echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" -if [ "$1" = "debug" -o "$1" = "javac" ] ; then - echo "Using JAVA_HOME: $JAVA_HOME" -else - echo "Using JRE_HOME: $JRE_HOME" +# Bugzilla 37848: only output this if we have a TTY +if [ $have_tty -eq 1 ]; then + echo "Using CATALINA_BASE: $CATALINA_BASE" + echo "Using CATALINA_HOME: $CATALINA_HOME" + echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" + if [ "$1" = "debug" -o "$1" = "javac" ] ; then + echo "Using JAVA_HOME: $JAVA_HOME" + else + echo "Using JRE_HOME: $JRE_HOME" + fi fi if [ "$1" = "jpda" ] ; then Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=394120&r1=394119&r2=394120&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Apr 14 08:25:07 2006 @@ -84,6 +84,10 @@ <fix> Fix handling of non matching if-range header (remm) </fix> + <fix> + <bug>37848</bug>: Only output catalina.sh diagnostic messages if we have a TTY, submitted by + David Shaw. (yoavs) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]