Changeset 20186 for gli

Show
Ignore:
Timestamp:
10.08.2009 10:56:41 (10 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/findgsdl.sh

    r19403 r20186  
    9999        # _version not set, but both env vars set, so default to 3 
    100100    _version=3 
    101     gsdlpath=$GSDL3SRCHOME 
     101    gsdlpath="$GSDL3SRCHOME" 
    102102    echo "Both Greenstone 2 and Greenstone 3 environments are set."  
    103103    echo "It is assumed you want to run Greenstone 3." 
     
    107107    elif [ "x$GSDL3SRCHOME" != "x" ]; then 
    108108    echo "Only gsdl3srchome set" 
    109     gsdlpath=$GSDL3SRCHOME 
     109    gsdlpath="$GSDL3SRCHOME" 
    110110    _version=3 
    111111    echo "$gsdlpath" 
    112112    elif [ "x$GSDLHOME" != "x" ]; then 
    113     gsdlpath=$GSDLHOME 
     113    gsdlpath="$GSDLHOME" 
    114114    _version=2 
    115115    # If it is not set, assume that the GLI is installed as a subdirectory of Greenstone 
     
    164164        echo "GSDLHOME environment variable is set to $GSDLHOME." 
    165165        echo "Will use this to find build scripts." 
    166         gsdl2path=$GSDLHOME 
     166        gsdl2path="$GSDLHOME" 
    167167        # If it is not set, assume that the gs2build subdirectory of Greenstone 3 exists 
    168168    else 
    169         gsdl2path=$GSDL3SRCHOME/gs2build 
     169        gsdl2path="$GSDL3SRCHOME/gs2build" 
    170170    fi 
    171171    fi 
  • gli/trunk/findjava.sh

    r19769 r20186  
    6767    # Give search4j a hint to find Java depending on the platform 
    6868    if [ $GSDLOS = linux ]; then 
    69     HINT=`cd $GSDLHOME;pwd`/packages/jre 
     69    HINT=`cd "$GSDLHOME";pwd`/packages/jre 
    7070    elif [ $GSDLOS = darwin ]; then 
    7171    HINT=/System/Library/Frameworks/JavaVM.framework/Home 
     
    129129    SEARCH4J_EXECUTABLE=search4j     
    130130elif [ -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 
    131     SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 
     131    SEARCH4J_EXECUTABLE="$GSDLHOME/bin/$GSDLOS/search4j" 
    132132elif [ -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 
    133     SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j 
     133    SEARCH4J_EXECUTABLE="$GSDL3SRCHOME/bin/search4j" 
    134134elif [ -x "../bin/$GSDLOS/search4j" ]; then 
    135135    SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j