patrickl 01/11/27 15:10:14
Modified: catalina/src/bin catalina.sh tool-wrapper.sh
Removed: catalina/src/bin setenv.sh
Log:
Incorporate Jon Stevens point that we should not distribute a setenv.sh as this will
cause overwriting of the user's modified setenv.sh upon upgrade. Now, setenv.sh must
be created by the user and if it does not exist (the default), setenv.sh is not
sourced.
Revision Changes Path
1.22 +4 -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- catalina.sh 2001/11/27 22:34:25 1.21
+++ catalina.sh 2001/11/27 23:10:14 1.22
@@ -24,7 +24,7 @@
# (JSSE) installation, whose JAR files will be added to the
# system class path used to start Tomcat.
#
-# $Id: catalina.sh,v 1.21 2001/11/27 22:34:25 patrickl Exp $
+# $Id: catalina.sh,v 1.22 2001/11/27 23:10:14 patrickl Exp $
# -----------------------------------------------------------------------------
@@ -54,7 +54,9 @@
fi
# Get user customizable environment variables
-. $CATALINA_HOME/bin/setenv.sh
+if [ -r "$CATALINA_HOME/bin/setenv.sh" ] ; then
+ . "$CATALINA_HOME/bin/setenv.sh"
+fi
if [ -z "$CATALINA_OPTS" ] ; then
CATALINA_OPTS=""
1.3 +4 -2 jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.sh
Index: tool-wrapper.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tool-wrapper.sh 2001/11/27 22:34:25 1.2
+++ tool-wrapper.sh 2001/11/27 23:10:14 1.3
@@ -12,7 +12,7 @@
#
# TOOL_OPTS (Optional) Java execution options for the tool.
#
-# $Id: tool-wrapper.sh,v 1.2 2001/11/27 22:34:25 patrickl Exp $
+# $Id: tool-wrapper.sh,v 1.3 2001/11/27 23:10:14 patrickl Exp $
# -----------------------------------------------------------------------------
@@ -42,7 +42,9 @@
fi
# Get user customizable environment variables
-. $CATALINA_HOME/bin/setenv.sh
+if [ -r "$CATALINA_HOME/bin/setenv.sh" ] ; then
+ . "$CATALINA_HOME/bin/setenv.sh"
+fi
if [ -z "$TOOL_OPTS" ] ; then
TOOL_OPTS=""
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
