Changeset 19770 for gsdl/trunk/gs2-server.sh

Timestamp:

2009-06-09T13:39:12+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 script gs2-server.sh is now updated to pass PROGNAME 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. 4. Have already updated the findjava.sh script concurrently with this findjava.sh and also updated gli.sh and client-gli.sh.

File:

• gsdl/trunk/gs2-server.sh (modified) (2 diffs)

gsdl/trunk/gs2-server.sh

@@ -3 +3 @@
 
 java_min_version=1.4.0_00
+PROGNAME="gs2-server"
 
 function autoset_gsdl_home() {
@@ -110 +111 @@
     # call the script with source, so that we have the variables it sets ($javapath)
     exit_status=0
-    source ./findjava.sh $serverlang
+    source ./findjava.sh "$serverlang" "$PROGNAME"
     exit_status=$?
     if [ "$exit_status" -eq 1 ]; then