Author: mturk
Date: Thu Mar 4 07:27:32 2010
New Revision: 918883
URL: http://svn.apache.org/viewvc?rev=918883&view=rev
Log:
If CATALINA_BASE is not defined we would try to read directly from
/bin/setenv.sh file
Modified:
tomcat/trunk/bin/catalina.sh
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=918883&r1=918882&r2=918883&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Thu Mar 4 07:27:32 2010
@@ -111,10 +111,11 @@
# but allow them to be specified in setenv.sh, in rare case when it is needed.
CLASSPATH=
-if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
- . "$CATALINA_BASE"/bin/setenv.sh
-elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
- . "$CATALINA_HOME"/bin/setenv.sh
+SETENVPATH="${CATALINA_BASE:-$CATALINA_HOME}"
+if [ -r "$SETENVPATH/bin/setenv.sh" ]; then
+ . "$SETENVPATH/bin/setenv.sh"
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
+ . "$CATALINA_HOME/bin/setenv.sh"
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
