Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840

Port the fix from catalina.sh to tool-wrapper.sh as well.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946686 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/tool-wrapper.sh b/bin/tool-wrapper.sh
index 89acc66..c435161 100755 (executable)
--- a/bin/tool-wrapper.sh
+++ b/bin/tool-wrapper.sh
@@ -54,7 +54,7 @@ done
 
 # Get standard environment variables
 PRGDIR=`dirname "$PRG"`
-CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
 
 # Ensure that any user defined CLASSPATH variables are not used on startup,
 # but allow them to be specified in setenv.sh, in rare case when it is needed.