Changeset 20186

Timestamp:

2009-08-10T10:56:41+12:00 (14 years ago)

Author:

kjdon

Message:

added some quotes around various paths so that can install into somewhere with spaces in path

Location:

gli/trunk

Files:

• findgsdl.sh (modified) (3 diffs)
• findjava.sh (modified) (2 diffs)

gli/trunk/findgsdl.sh

@@ -99 +99 @@
         # _version not set, but both env vars set, so default to 3
     _version=3
-    gsdlpath=$GSDL3SRCHOME
+    gsdlpath="$GSDL3SRCHOME"
     echo "Both Greenstone 2 and Greenstone 3 environments are set." 
     echo "It is assumed you want to run Greenstone 3."
@@ -107 +107 @@
     elif [ "x$GSDL3SRCHOME" != "x" ]; then
     echo "Only gsdl3srchome set"
-    gsdlpath=$GSDL3SRCHOME
+    gsdlpath="$GSDL3SRCHOME"
     _version=3
     echo "$gsdlpath"
     elif [ "x$GSDLHOME" != "x" ]; then
-    gsdlpath=$GSDLHOME
+    gsdlpath="$GSDLHOME"
     _version=2
     # If it is not set, assume that the GLI is installed as a subdirectory of Greenstone
@@ -164 +164 @@
         echo "GSDLHOME environment variable is set to $GSDLHOME."
         echo "Will use this to find build scripts."
-        gsdl2path=$GSDLHOME
+        gsdl2path="$GSDLHOME"
         # If it is not set, assume that the gs2build subdirectory of Greenstone 3 exists
     else
-        gsdl2path=$GSDL3SRCHOME/gs2build
+        gsdl2path="$GSDL3SRCHOME/gs2build"
     fi
     fi

gli/trunk/findjava.sh

@@ -67 +67 @@
     # Give search4j a hint to find Java depending on the platform
     if [ $GSDLOS = linux ]; then
-    HINT=`cd $GSDLHOME;pwd`/packages/jre
+    HINT=`cd "$GSDLHOME";pwd`/packages/jre
     elif [ $GSDLOS = darwin ]; then
     HINT=/System/Library/Frameworks/JavaVM.framework/Home
@@ -129 +129 @@
     SEARCH4J_EXECUTABLE=search4j    
 elif [ -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
-    SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
+    SEARCH4J_EXECUTABLE="$GSDLHOME/bin/$GSDLOS/search4j"
 elif [ -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
-    SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j
+    SEARCH4J_EXECUTABLE="$GSDL3SRCHOME/bin/search4j"
 elif [ -x "../bin/$GSDLOS/search4j" ]; then
     SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j