- Timestamp:
- 2009-04-21T14:25:36+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/gs2-server.sh
r19040 r19158 7 7 8 8 # remove leading ./ if present 9 prog= ${0#./}9 prog="${0#./}" 10 10 11 isrelative= ${prog%%/*}11 isrelative="${prog%%/*}" 12 12 13 if [ ! -z $isrelative] ; then13 if [ ! -z "$isrelative" ] ; then 14 14 # some text is left after stripping 15 15 # => is relative 16 pwd=$PWD 17 prog="$pwd/$prog" 16 prog="$PWD/$prog" 18 17 fi 19 18 20 fulldir= ${prog%/*}19 fulldir="${prog%/*}" 21 20 22 21 # remove trailing /. if present 23 eval $1=${fulldir%/.}22 eval "$1=\"${fulldir%/.}\"" 24 23 } 25 24 … … 52 51 # Setup Greenstone2, unless it has already been done 53 52 if [ -z "$GSDLHOME" ]; then 54 pushd $gsdl2path> /dev/null53 pushd "$gsdl2path" > /dev/null 55 54 source setup.bash 56 55 popd > /dev/null … … 74 73 if [ ! -e "$GSDLHOME/llssite.cfg" ]; then 75 74 if [ -e "$GSDLHOME/llssite.cfg.in" ]; then 76 75 cp "$GSDLHOME/llssite.cfg.in" "$GSDLHOME/llssite.cfg" 77 76 else 78 77 echo "Warning: could not find llssite.cfg.in to create llssite.cfg from." 79 78 fi 80 fi 79 fi 81 80 82 81 # JRE_HOME or JAVA_HOME must be set correctly to run this program … … 85 84 # In Java code, '...getResourceAsStream("build.properties")' 86 85 # needs up to be in the right directory when run 87 pushd $gsdl2path> /dev/null86 pushd "$gsdl2path" > /dev/null 88 87 89 88 90 89 #CLASSPATH 91 90 if [ `isinpath "$CLASSPATH" "$GSDLHOME/lib/java"` == "false" ]; then 92 CLASSPATH=$GSDLHOME/lib/java:$CLASSPATH 93 for JARFILE in $GSDLHOME/lib/java/*.jar; do 94 CLASSPATH=$CLASSPATH:$JARFILE 95 done 96 export CLASSPATH 91 CLASSPATH="$GSDLHOME/lib/java:$CLASSPATH" 92 for JARFILE in lib/java/*.jar; do 93 CLASSPATH="$CLASSPATH:$GSDLHOME/$JARFILE" 94 done 95 export CLASSPATH 96 echo " - Adjusted CLASSPATH" 97 97 98 echo " - Adjusted CLASSPATH"99 98 else 100 99 echo " - CLASSPATH already correct" 101 100 fi 102 101 103 javapath= `search4j -m $java_min_version -e`104 $javapath org.greenstone.server.Server2 $GSDLHOME $serverlang$*102 javapath="`search4j -m $java_min_version -e`" 103 "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* 105 104 106 105 popd > /dev/null
Note:
See TracChangeset
for help on using the changeset viewer.