Changeset 20655 for gli/trunk/findjava.sh

Timestamp:

2009-09-21T14:29:59+12:00 (15 years ago)

Author:

ak19

Message:

Updated in sync with the changes Katherine just made to gs2-server.sh and findjava.sh (JAVA_HOME\bin added to the PATH) before launching the webserver so that apache can pass it on to the lucene indexers.

File:

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

gli/trunk/findjava.sh

@@ -15 +15 @@
     # There is a JAVA_HOME already set, we're going to try using that
     javapath="$JAVA_HOME/bin/java"
-
+    javahome="$JAVA_HOME"
     # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed)
     if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then
@@ -75 +75 @@
     
     javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
+    javahome="`"$SEARCH4J_EXECUTABLE" -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
 
     if [ "$?" != "0" ]; then