- Timestamp:
- 2008-11-04T13:38:08+13:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/gli.sh
r17669 r17670 176 176 if [ "x$GSDLHOME" = "x" ]; then 177 177 cd "$gsdlpath" 178 . setup.bash178 . ./setup.bash 179 179 cd "$thisdir" 180 180 fi … … 184 184 if [ "x$GSDL3HOME" = "x" -o "x$GSDL3SRCHOME" = "x" ]; then 185 185 cd "$gsdlpath" 186 . gs3-setup.sh186 . ./gs3-setup.sh 187 187 cd "$thisdir" 188 188 fi … … 211 211 if [ "x$GSDLHOME" = "x" ]; then 212 212 cd "$gsdl2path" 213 . setup.bash213 . ./setup.bash 214 214 cd "$thisdir" 215 215 fi … … 275 275 276 276 # Some users may set this line manually 277 javapath= 278 279 if [ "$javapath" = ""]; then277 javapath="" 278 279 if [ -z $javapath ]; then 280 280 281 281 # sus out search4j 282 if [ "$_version" -eq 2 -a - x"$GSDLHOME/bin/$GSDLOS/search4j" ]; then282 if [ "$_version" -eq 2 -a -e "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 283 283 SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 284 elif [ "$_version" -eq 3 -a - x"$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then284 elif [ "$_version" -eq 3 -a -e "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 285 285 SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j 286 elif [ - x"../bin/$GSDLOS/search4j" ]; then286 elif [ -e "../bin/$GSDLOS/search4j" ]; then 287 287 SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j 288 elif [ - x"../bin/search4j" ]; then288 elif [ -e "../bin/search4j" ]; then 289 289 SEARCH4J_EXECUTABLE=../bin/search4j 290 290 else … … 301 301 302 302 # last-resort tricks 303 if [ -e "../packages/jre" ]; then 304 function search4j_shell_function() { 305 echo `cd ../packages/jre/bin; pwd`/java 306 } 307 SEARCH4J_EXECUTABLE=search4j_shell_function 308 elif [ "$JAVA_HOME" != "" ]; then 309 function search4j_shell_function() { 310 echo $JAVA_HOME/bin/java 311 } 312 SEARCH4J_EXECUTABLE=search4j_shell_function 313 else 314 exit 1 315 fi 316 fi 317 318 HINT=`cd ..;pwd` 303 # if [ -e "../packages/jre" ]; then 304 # function search4j_shell_function() { 305 # echo `cd ../packages/jre/bin; pwd`/java 306 # } 307 # SEARCH4J_EXECUTABLE=search4j_shell_function 308 # elif [ "$JAVA_HOME" != "" ]; then 309 # function search4j_shell_function() { 310 # echo $JAVA_HOME/bin/java 311 # } 312 # SEARCH4J_EXECUTABLE=search4j_shell_function 313 # else 314 # exit 1 315 # fi 316 fi 317 318 # Since search4j does not recursively search yet, the hint has been altered for now... 319 HINT=`cd ..;pwd`/packages/jre 319 320 javapath=`$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION` 320 321
Note:
See TracChangeset
for help on using the changeset viewer.