Changeset 14724

Show
Ignore:
Timestamp:
23.10.2007 16:57:09 (12 years ago)
Author:
qq6
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/branches/3.03/resources/tomcat/setclasspath.sh

    r11288 r14724  
    77 
    88# First clear out the user classpath 
    9 # gs3 - we need to set classpath 
    109CLASSPATH=$CLASSPATH 
    1110 
    1211# Make sure prerequisite environment variables are set 
    1312if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then 
    14   echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" 
    15   echo "At least one of these environment variable is needed to run this program" 
    16   exit 1 
     13  # Bugzilla 37284 
     14  if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then 
     15    export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" 
     16  else 
     17    echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" 
     18    echo "At least one of these environment variable is needed to run this program" 
     19    exit 1 
     20  fi 
    1721fi 
    1822if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then