Changeset 19769
- Timestamp:
- 2009-06-09T13:38:05+12:00 (15 years ago)
- Location:
- gli/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/client-gli.sh
r19737 r19769 86 86 # call the script with source, so that we have the variables it sets ($javapath) 87 87 exit_status=0 88 source ./findjava.sh $glilang88 source ./findjava.sh "$glilang" "$PROGABBR" 89 89 exit_status=$? 90 90 if [ "$exit_status" -eq 1 ]; then -
gli/trunk/findjava.sh
r19740 r19769 67 67 # Give search4j a hint to find Java depending on the platform 68 68 if [ $GSDLOS = linux ]; then 69 HINT=`cd ..;pwd`/packages/jre69 HINT=`cd $GSDLHOME;pwd`/packages/jre 70 70 elif [ $GSDLOS = darwin ]; then 71 71 HINT=/System/Library/Frameworks/JavaVM.framework/Home … … 73 73 74 74 javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`" 75 75 76 76 if [ "$?" != "0" ]; then 77 77 … … 120 120 #JAVA_HOME= 121 121 gslang=$1 122 PROGNAME=$2 122 123 MINIMUM_JAVA_VERSION=1.4.0_00 123 124 MIN_DISPLAY_VERSION=1.4 … … 125 126 # sus out search4j 126 127 # first look for compiled search4j executable inside the current folder 127 if [ - fsearch4j ]; then128 if [ -x search4j ]; then 128 129 SEARCH4J_EXECUTABLE=search4j 129 elif [ - e"$GSDLHOME/bin/$GSDLOS/search4j" ]; then130 elif [ -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 130 131 SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 131 elif [ - e"$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then132 elif [ -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 132 133 SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j 133 elif [ - e"../bin/$GSDLOS/search4j" ]; then134 elif [ -x "../bin/$GSDLOS/search4j" ]; then 134 135 SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j 135 elif [ - e"../bin/search4j" ]; then136 elif [ -x "../bin/search4j" ]; then 136 137 SEARCH4J_EXECUTABLE=../bin/search4j 137 138 else -
gli/trunk/gli.sh
r19737 r19769 82 82 # call the script with source, so that we have the variables it sets ($javapath) 83 83 exit_status=0 84 source ./findjava.sh $glilang84 source ./findjava.sh "$glilang" "$PROGNAME" 85 85 exit_status=$? 86 86 if [ "$exit_status" -eq 1 ]; then
Note:
See TracChangeset
for help on using the changeset viewer.