Changeset 20658 for gsdl

Timestamp:

2009-09-21T19:02:45+12:00 (15 years ago)

Author:

ak19

Message:

Allow the user to set the path to javahome. This was necessary for the binary release on MacBook Pro running MacOS 10.4, since search4j gives a bus error on it.

File:

• gsdl/trunk/findjava.sh (modified) (2 diffs)

gsdl/trunk/findjava.sh

@@ -22 +22 @@
         echo "WARNING: "
         echo "Java Runtime not bundled with this Greenstone installation."
-        echo "Using JAVA_HOME: %JAVA_HOME%"
-        echo "(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.)"
+        echo "Using JAVA_HOME: $JAVA_HOME"
+        echo "(NOTE: this needs to be $MIN_DISPLAY_VERSION or higher.)"
         echo "***************************************************************************"
         echo
@@ -121 +121 @@
 ## ---- Check Java ----
 # Some users may set this line manually
-#JAVA_HOME=
+javahome=
 gslang=$1
 PROGNAME=$2
 MINIMUM_JAVA_VERSION=1.4.0_00
 MIN_DISPLAY_VERSION=1.4
+if [ "x$javahome" != "x" ]; then
+    JAVA_HOME=$javahome;
+    try_java "$MIN_DISPLAY_VERSION"
+    retval=$?
+    return $retval
+fi
 
 # sus out search4j