From 59ee4c6296361550e6a5398181311e4a25c2b206 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 26 Nov 2002 22:07:09 +0000 Subject: [PATCH] - more Changed files: jakarta-tomcat-JAVA_HOME.patch -> 1.3 --- jakarta-tomcat-JAVA_HOME.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jakarta-tomcat-JAVA_HOME.patch b/jakarta-tomcat-JAVA_HOME.patch index 4e98792..8bae964 100644 --- a/jakarta-tomcat-JAVA_HOME.patch +++ b/jakarta-tomcat-JAVA_HOME.patch @@ -12,6 +12,23 @@ diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/catalina.sh jakarta-tomc # ----- Execute The Requested Command ----------------------------------------- echo "Using CATALINA_BASE: $CATALINA_BASE" +diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh +--- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh Tue Nov 26 22:37:05 2002 ++++ jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh Tue Nov 26 23:05:50 2002 +@@ -6,9 +6,13 @@ + + # Make sure prerequisite environment variables are set + if [ -z "$JAVA_HOME" ]; then ++ if [ -x /usr/lib/java/bin/java ]; then ++ JAVA_HOME=/usr/lib/java ++ else + echo "The JAVA_HOME environment variable is not defined" + echo "This environment variable is needed to run this program" + exit 1 ++ fi + fi + if [ ! -r "$JAVA_HOME"/bin/java ]; then + echo "The JAVA_HOME environment variable is not defined correctly" diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh --- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh Tue Nov 26 22:37:05 2002 +++ jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh Tue Nov 26 22:53:07 2002 -- 2.44.0