Changeset 20059 for greenstone3/trunk/gs3-setup.sh

Timestamp:

2009-07-22T09:38:23+12:00 (15 years ago)

Author:

oranfry

Message:

making search4j calls use the bundled jre as a priority hint consistently, and added quotes to a few paths

File:

• greenstone3/trunk/gs3-setup.sh (modified) (2 diffs)

greenstone3/trunk/gs3-setup.sh

@@ -128 +128 @@
   echo "Checking Java"
 
-  HINT=`pwd`/packages/jre
-  FOUNDJAVAHOME=`bin/search4j -p $HINT -m $java_min_version`
+  HINT="`pwd`/packages/jre"
+  FOUNDJAVAHOME="`bin/search4j -p $HINT -m $java_min_version`"
   if [ "$?" != "0" ]; then
 
@@ -135 +135 @@
     if [ "$?" == "0" ]; then
       #bundled java exists, set up
-      export JAVA_HOME=$FOUNDJAVAHOME
+      export JAVA_HOME="$FOUNDJAVAHOME"
       echo "  - Set (exported) JAVA_HOME to $FOUNDJAVAHOME"
     else