Changeset 19769 for gli/trunk

Timestamp:

2009-06-09T13:38:05+12:00 (15 years ago)

Author:

ak19

Message:

1. Search4j was previously given a hint that assumed that findjava was working with GLI instead of a more general case (such as gs2-server.sh). Now it is uses GSDLHOME to work out the hint. 2. PROGNAME needs to be passed in as a parameter for display. The scripts gli.sh and client-gli.sh are now updated to pass PROGNAME (or PROGABBR) as an additional argument to findjava.sh. 3. Instead of merely testing whether the search4j file exists, Oran suggested testing whether search4j file exists AND is executable.

Location:

gli/trunk

Files:

• client-gli.sh (modified) (1 diff)
• findjava.sh (modified) (4 diffs)
• gli.sh (modified) (1 diff)

gli/trunk/client-gli.sh

@@ -86 +86 @@
 # call the script with source, so that we have the variables it sets ($javapath)
 exit_status=0
-source ./findjava.sh $glilang
+source ./findjava.sh "$glilang" "$PROGABBR"
 exit_status=$?
 if [ "$exit_status" -eq 1 ]; then

gli/trunk/findjava.sh

@@ -67 +67 @@
     # Give search4j a hint to find Java depending on the platform
     if [ $GSDLOS = linux ]; then
-    HINT=`cd ..;pwd`/packages/jre
+    HINT=`cd $GSDLHOME;pwd`/packages/jre
     elif [ $GSDLOS = darwin ]; then
     HINT=/System/Library/Frameworks/JavaVM.framework/Home
@@ -73 +73 @@
     
     javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
-    
+
     if [ "$?" != "0" ]; then
     
@@ -120 +120 @@
 #JAVA_HOME=
 gslang=$1
+PROGNAME=$2
 MINIMUM_JAVA_VERSION=1.4.0_00
 MIN_DISPLAY_VERSION=1.4
@@ -125 +126 @@
 # sus out search4j
 # first look for compiled search4j executable inside the current folder
-if [ -f search4j ]; then
+if [ -x search4j ]; then
     SEARCH4J_EXECUTABLE=search4j    
-elif [ -e "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
+elif [ -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
     SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
-elif [ -e "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
+elif [ -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
     SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j
-elif [ -e "../bin/$GSDLOS/search4j" ]; then
+elif [ -x "../bin/$GSDLOS/search4j" ]; then
     SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j
-elif [ -e "../bin/search4j" ]; then
+elif [ -x "../bin/search4j" ]; then
     SEARCH4J_EXECUTABLE=../bin/search4j
 else

gli/trunk/gli.sh

@@ -82 +82 @@
 # call the script with source, so that we have the variables it sets ($javapath)
 exit_status=0
-source ./findjava.sh $glilang
+source ./findjava.sh "$glilang" "$PROGNAME"
 exit_status=$?
 if [ "$exit_status" -eq 1 ]; then