From 22ade0ca86aa5759386d0ff693bbf01fdd0aedbf Mon Sep 17 00:00:00 2001 From: kkolinko Date: Thu, 20 May 2010 16:19:49 +0000 Subject: [PATCH] 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 --- bin/tool-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tool-wrapper.sh b/bin/tool-wrapper.sh index 89acc66f4..c43516172 100755 --- 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. -- 2.11.0