Changeset 20187

Timestamp:

2009-08-10T10:57:45+12:00 (15 years ago)

Author:

kjdon

Message:

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

Location:

greenstone3/trunk

Files:

• gs3-server.sh (modified) (3 diffs)
• gs3-setup.sh (modified) (4 diffs)

greenstone3/trunk/gs3-server.sh

@@ -7 +7 @@
 
   # remove leading ./ if present
-  prog=${0#./}
+  prog="${0#./}"
 
-  isrelative=${prog%%/*}
+  isrelative="${prog%%/*}"
 
   if [ ! -z $isrelative ] ; then
     # some text is left after stripping
     # => is relative
-    pwd=$PWD
+    pwd="$PWD"
     prog="$pwd/$prog"
   fi
 
-  fulldir=${prog%/*}
+  fulldir="${prog%/*}"
 
   # remove trailing /. if present
-  eval $1=${fulldir%/.}
+  eval $1=\""${fulldir%/.}"\"
 }
 
@@ -38 +38 @@
 # Some users may set the above line manually
 if [ -z "$gsdl3path" ]; then
-   autoset_gsdl_home gsdl3path
+   autoset_gsdl_home "gsdl3path"
 fi
 
@@ -48 +48 @@
 fi
 
-
+echo $PATH
 # JRE_HOME or JAVA_HOME must be set correctly to run this program
 HINT="`pwd`/packages/jre"

greenstone3/trunk/gs3-setup.sh

@@ -44 +44 @@
   echo "Setting up your environment for Greenstone3"
   ## main greenstone environment variables ##
-  GSDL3SRCHOME=`pwd`
-  GSDL3HOME=$GSDL3SRCHOME/web
+  GSDL3SRCHOME="`pwd`"
+  GSDL3HOME="$GSDL3SRCHOME/web"
   export GSDL3HOME
   export GSDL3SRCHOME
@@ -58 +58 @@
 
   #change this if external tomcat
-  TOMCAT_HOME=$GSDL3SRCHOME/packages/tomcat
+  TOMCAT_HOME="$GSDL3SRCHOME/packages/tomcat"
 
 
@@ -75 +75 @@
   addtopath CLASSPATH "$GSDL3HOME/WEB-INF/classes"
   addtopath CLASSPATH "$GSDL3SRCHOME/resources/java"
-  for JARFILE in $GSDL3SRCHOME/*.jar; do
+  for JARFILE in "$GSDL3SRCHOME"/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done
-  for JARFILE in $GSDL3SRCHOME/lib/jni/*.jar; do
+  for JARFILE in "$GSDL3SRCHOME"/lib/jni/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done
-  for JARFILE in $GSDL3SRCHOME/lib/java/*.jar; do
+  for JARFILE in "$GSDL3SRCHOME"/lib/java/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done
-  for JARFILE in $GSDL3HOME/WEB-INF/lib/*.jar; do
+  for JARFILE in "$GSDL3HOME"/WEB-INF/lib/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done
   # Tomcat 5 jar files
-  for JARFILE in $TOMCAT_HOME/common/endorsed/*.jar; do
+  for JARFILE in "$TOMCAT_HOME"/common/endorsed/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done    
   # Tomcat 6 jar files
-  for JARFILE in $TOMCAT_HOME/lib/*.jar; do
+  for JARFILE in "$TOMCAT_HOME"/lib/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done    
   
-  for JARFILE in $GSDL3SRCHOME/build/*.jar; do
+  for JARFILE in "$GSDL3SRCHOME"/build/*.jar; do
     addtopath CLASSPATH "$JARFILE"
   done
@@ -127 +127 @@
 
   HINT="`pwd`/packages/jre"
-  FOUNDJAVAHOME="`bin/search4j -p $HINT -m $java_min_version`"
+  FOUNDJAVAHOME="`bin/search4j -p \"$HINT\" -m $java_min_version`"
   if [ "$?" == "0" ]; then
       #bundled java exists, set up