Changeset 20187


Ignore:
Timestamp:
2009-08-10T10:57:45+12:00 (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/gs3-server.sh

    r20059 r20187  
    77
    88  # remove leading ./ if present
    9   prog=${0#./}
     9  prog="${0#./}"
    1010
    11   isrelative=${prog%%/*}
     11  isrelative="${prog%%/*}"
    1212
    1313  if [ ! -z $isrelative ] ; then
    1414    # some text is left after stripping
    1515    # => is relative
    16     pwd=$PWD
     16    pwd="$PWD"
    1717    prog="$pwd/$prog"
    1818  fi
    1919
    20   fulldir=${prog%/*}
     20  fulldir="${prog%/*}"
    2121
    2222  # remove trailing /. if present
    23   eval $1=${fulldir%/.}
     23  eval $1=\""${fulldir%/.}"\"
    2424}
    2525
     
    3838# Some users may set the above line manually
    3939if [ -z "$gsdl3path" ]; then
    40    autoset_gsdl_home gsdl3path
     40   autoset_gsdl_home "gsdl3path"
    4141fi
    4242
     
    4848fi
    4949
    50 
     50echo $PATH
    5151# JRE_HOME or JAVA_HOME must be set correctly to run this program
    5252HINT="`pwd`/packages/jre"
  • greenstone3/trunk/gs3-setup.sh

    r20138 r20187  
    4444  echo "Setting up your environment for Greenstone3"
    4545  ## main greenstone environment variables ##
    46   GSDL3SRCHOME=`pwd`
    47   GSDL3HOME=$GSDL3SRCHOME/web
     46  GSDL3SRCHOME="`pwd`"
     47  GSDL3HOME="$GSDL3SRCHOME/web"
    4848  export GSDL3HOME
    4949  export GSDL3SRCHOME
     
    5858
    5959  #change this if external tomcat
    60   TOMCAT_HOME=$GSDL3SRCHOME/packages/tomcat
     60  TOMCAT_HOME="$GSDL3SRCHOME/packages/tomcat"
    6161
    6262
     
    7575  addtopath CLASSPATH "$GSDL3HOME/WEB-INF/classes"
    7676  addtopath CLASSPATH "$GSDL3SRCHOME/resources/java"
    77   for JARFILE in $GSDL3SRCHOME/*.jar; do
     77  for JARFILE in "$GSDL3SRCHOME"/*.jar; do
    7878    addtopath CLASSPATH "$JARFILE"
    7979  done
    80   for JARFILE in $GSDL3SRCHOME/lib/jni/*.jar; do
     80  for JARFILE in "$GSDL3SRCHOME"/lib/jni/*.jar; do
    8181    addtopath CLASSPATH "$JARFILE"
    8282  done
    83   for JARFILE in $GSDL3SRCHOME/lib/java/*.jar; do
     83  for JARFILE in "$GSDL3SRCHOME"/lib/java/*.jar; do
    8484    addtopath CLASSPATH "$JARFILE"
    8585  done
    86   for JARFILE in $GSDL3HOME/WEB-INF/lib/*.jar; do
     86  for JARFILE in "$GSDL3HOME"/WEB-INF/lib/*.jar; do
    8787    addtopath CLASSPATH "$JARFILE"
    8888  done
    8989  # Tomcat 5 jar files
    90   for JARFILE in $TOMCAT_HOME/common/endorsed/*.jar; do
     90  for JARFILE in "$TOMCAT_HOME"/common/endorsed/*.jar; do
    9191    addtopath CLASSPATH "$JARFILE"
    9292  done   
    9393  # Tomcat 6 jar files
    94   for JARFILE in $TOMCAT_HOME/lib/*.jar; do
     94  for JARFILE in "$TOMCAT_HOME"/lib/*.jar; do
    9595    addtopath CLASSPATH "$JARFILE"
    9696  done   
    9797 
    98   for JARFILE in $GSDL3SRCHOME/build/*.jar; do
     98  for JARFILE in "$GSDL3SRCHOME"/build/*.jar; do
    9999    addtopath CLASSPATH "$JARFILE"
    100100  done
     
    127127
    128128  HINT="`pwd`/packages/jre"
    129   FOUNDJAVAHOME="`bin/search4j -p $HINT -m $java_min_version`"
     129  FOUNDJAVAHOME="`bin/search4j -p \"$HINT\" -m $java_min_version`"
    130130  if [ "$?" == "0" ]; then
    131131      #bundled java exists, set up
Note: See TracChangeset for help on using the changeset viewer.