markt 2004/08/15 08:20:15 Modified: catalina/src/bin catalina.sh Log: Fix bug 12089. CATALINA_HOME ignored and reset by catalina.sh - Fixed by porting fix for bug 30325 from TC5 Revision Changes Path 1.37 +5 -2 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh Index: catalina.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- catalina.sh 14 Mar 2004 17:40:23 -0000 1.36 +++ catalina.sh 15 Aug 2004 15:20:15 -0000 1.37 @@ -61,7 +61,10 @@ # Get standard environment variables PRGDIR=`dirname "$PRG"` -CATALINA_HOME=`cd "$PRGDIR/.." ; pwd` + +# Only set CATALINA_HOME if not already set +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd` + if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then . "$CATALINA_HOME"/bin/setenv.sh fi
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]