Changeset 20059

Timestamp:

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

Author:

oranfry

Message:

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

Location:

greenstone3/trunk

Files:

• gs3-server.sh (modified) (1 diff)
• gs3-setup.sh (modified) (2 diffs)

greenstone3/trunk/gs3-server.sh

@@ -50 +50 @@
 
 # JRE_HOME or JAVA_HOME must be set correctly to run this program
-search4j -m $java_min_version &> /dev/null
+HINT="`pwd`/packages/jre"
+javapath=`search4j -p "$HINT" -m $java_min_version -e` 
 if [ "$?" == "0" ]; then
     # In Java code, '...getResourceAsStream("build.properties")'
     # needs up to be in the right directory when run
-    pushd $gsdl3path > /dev/null
+    pushd "$gsdl3path" > /dev/null
 
-    javapath=`search4j -m $java_min_version -e` 
-    $javapath org.greenstone.server.Server3 $GSDL3SRCHOME $serverlang
+    "$javapath" org.greenstone.server.Server3 "$GSDL3SRCHOME" $serverlang
 
     popd > /dev/null

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