Changeset 19738

Timestamp:

2009-06-04T16:59:29+12:00 (15 years ago)

Author:

ak19

Message:

Instead of calling search4j directly, it reuses the code of findjava.sh (now nearly duplicated and a copy placed in the GS2 installation folder).

File:

• gsdl/trunk/gs2-server.sh (modified) (1 diff)

gsdl/trunk/gs2-server.sh

@@ -105 +105 @@
     fi
 
-    javapath="`search4j -m $java_min_version -e`"
+    ## ---- Check Java ----
+    # call the script with source, so that we have the variables it sets ($javapath)
+    exit_status=0
+    source ./findjava.sh $serverlang
+    exit_status=$?
+    if [ "$exit_status" -eq 1 ]; then
+        exit 1;
+    fi
+
     if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then 
         # verbose mode, show all output, but then we can't run the server interface in the background