Changeset 14724

Timestamp:

2007-10-23T16:57:09+13:00 (16 years ago)

Author:

qq6

Message:

looking for the JRE home first then the JAVA_home when running tomcat

File:

• greenstone3/branches/3.03/resources/tomcat/setclasspath.sh (modified) (1 diff)

greenstone3/branches/3.03/resources/tomcat/setclasspath.sh

@@ -7 +7 @@
 
 # First clear out the user classpath
-# gs3 - we need to set classpath
 CLASSPATH=$CLASSPATH
 
 # Make sure prerequisite environment variables are set
 if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-  echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
-  echo "At least one of these environment variable is needed to run this program"
-  exit 1
+  # Bugzilla 37284
+  if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then
+    export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
+  else
+    echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
+    echo "At least one of these environment variable is needed to run this program"
+    exit 1
+  fi
 fi
 if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then