Changeset 28740 for other-projects/expeditee-release-kits/scripts/run.sh

Timestamp:

2013-12-03T16:20:10+13:00 (10 years ago)

Author:

ak19

Message:

Expeditee team (jts21). Add shared/windows folder with self-extracting Java 8 JRE, moved windows_wrapper.cpp to shared/windows/wrapper/wrapper.cpp, fixed run/findjava scripts

File:

• other-projects/expeditee-release-kits/scripts/run.sh (modified) (1 diff)

other-projects/expeditee-release-kits/scripts/run.sh

@@ -30 +30 @@
 ##  ---- Determine JAVA_HOME ----
 # JRE_HOME or JAVA_HOME must be set correctly to run this program
-java_min_version=1.8.0_00
-bin/search4j -m $java_min_version &> /dev/null
-# for some reason, Mac requires an echo after the above
-echo
-if [ "$?" == "0" ]; then
+#CLASSPATH
+# if setting classpath, see gs2-server.sh, then export it
 
-    #CLASSPATH
-    # if setting classpath, see gs2-server.sh, then export it
+## ---- Check Java ----
+# call the script with source, so that we have the variables it sets ($javapath)
+exit_status=0
+source bin/findjava.sh "$exp_lang" "$PROGNAME"
+exit_status=$?
+if [ "$exit_status" -eq 1 ]; then
+    exit 1;
+fi
+export PATH=$javahome/bin:$PATH
 
-    ## ---- Check Java ----
-    # call the script with source, so that we have the variables it sets ($javapath)
-    exit_status=0
-    source bin/findjava.sh "$exp_lang" "$PROGNAME"
-    exit_status=$?
-    if [ "$exit_status" -eq 1 ]; then
-        exit 1;
-    fi
-    export PATH=$javahome/bin:$PATH
+# -Xdock:name      To set the name of the app in the MacOS Dock bar
+# -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)    
+custom_vm_args=""
+if [ "$EXPEDITEE_OS" = "darwin" ]; then
+    custom_vm_args="-Xdock:name=$PROGFULLNAME"
+fi
 
-    # -Xdock:name      To set the name of the app in the MacOS Dock bar
-    # -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)    
-    custom_vm_args=""
-    if [ "$EXPEDITEE_OS" = "darwin" ]; then
-        custom_vm_args="-Xdock:name=$PROGFULLNAME"
-    fi
+#-Xmx128M -classpath <classpath>...
 
-    #-Xmx128M -classpath <classpath>...
+"$javapath" $custom_vm_args -jar Expeditee.jar $*
 
-    "$javapath" $custom_vm_args -jar Expeditee.jar $*
-
-    # silent mode: when launched in the background (with & at end), need to 
-    # redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term.
-    #"$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$GSDLOS$GSDLARCH" "$serverlang" $* > /dev/null &
-fi
+# silent mode: when launched in the background (with & at end), need to 
+# redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term.
+#"$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$GSDLOS$GSDLARCH" "$serverlang" $* > /dev/null &