yoavs 2004/07/28 08:49:19
Modified: catalina/src/bin catalina.sh
webapps/docs changelog.xml
Log:
Addressed Bugzilla 30325, only set CATALINA_HOME if not already set.
Revision Changes Path
1.16 +5 -2 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
Index: catalina.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- catalina.sh 28 Jul 2004 00:47:47 -0000 1.15
+++ catalina.sh 28 Jul 2004 15:49:19 -0000 1.16
@@ -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
1.81 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- changelog.xml 28 Jul 2004 15:00:32 -0000 1.80
+++ changelog.xml 28 Jul 2004 15:49:19 -0000 1.81
@@ -43,6 +43,9 @@
<fix>
<bug>28875</bug>: Made ErrorReportValve use UTF-8 encoding by default.
(yoavs)
</fix>
+ <fix>
+ <bug>30325</bug>: Only set CATALINA_HOME if not already set (in
bin/catalina.sh). (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
