Hello,
Attached is a patch to the
jakarta-tomcat-4.0/catalina/src/bin/catalina.sh file.
This patch eliminates the use of the "pushd" and "popd" shell commands
when running this script with the "debug" argument.
This patch is necessary because "pushd" and "popd" are only built-in
commands in the Bash shell. While /bin/sh is the Bash shell on Linux,
/bin/sh is the Bourne shell on most other Unix platforms. As a result,
on Unix platforms where /bin/sh is the Bourne shell, this script will
fail since there is no "pushd" or "popd".
Thanks,
Patrick
--
_____________________________________________________________________
Patrick Luby Email: [EMAIL PROTECTED]
Software Engineering Manager Phone: 408-863-3284
Sun Microsystems, Desktop Foundation Software
901 San Antonio Road, UCUP01-103
Palo Alto, CA 94303-4900
_____________________________________________________________________
Index: catalina.sh
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
retrieving revision 1.19
diff -u -r1.19 catalina.sh
--- catalina.sh 2001/09/12 17:38:47 1.19
+++ catalina.sh 2001/09/14 00:59:47
@@ -128,12 +128,11 @@
if [ "$1" = "debug" ] ; then
shift
- pushd $CATALINA_HOME
if [ "$1" = "-security" ] ; then
shift
$JAVA_HOME/bin/jdb \
$CATALINA_OPTS \
- -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
+ -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
-classpath $CP \
-Dcatalina.base=$CATALINA_BASE \
-Dcatalina.home=$CATALINA_HOME \
@@ -141,13 +140,12 @@
else
$JAVA_HOME/bin/jdb \
$CATALINA_OPTS \
- -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
+ -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
-classpath $CP \
-Dcatalina.base=$CATALINA_BASE \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start
fi
- popd
elif [ "$1" = "embedded" ] ; then
