Changeset 34259 for main/trunk/gli/client-gli.sh

Timestamp:

2020-07-10T14:26:03+12:00 (3 years ago)

Author:

ak19

Message:

Related to commit 34258. Equivalent changes for linux/mac: when running a standalone client-gli installation, if there's a packages/OS/jre (as for running GS3/GLI, this JRE may not get used on Mac as this comes preinstalled with Java) and if there's a bin/OS/search4j, client-gli.sh and findjava.sh will now use the path to a jre inside the standalone client-gli as hint for a bundled search4j to locate an appropriate java.

File:

• main/trunk/gli/client-gli.sh (modified) (1 diff)

main/trunk/gli/client-gli.sh

@@ -83 +83 @@
     if [ "$exit_status" -ne 1 ]; then
     local_gs="true"
-    fi 
+    fi
+else
+    export GLIHOME=`pwd`
+    echo "@@@ Standalone client-gli, GLIHOME: $GLIHOME"
+    # GSDLOS would not have been set yet
+    if test "x$GSDLOS" = "x" ; then
+    GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+    # check for running bash under cygwin
+    if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; then
+        GSDLOS=windows
+    fi 
+    fi
+    export GSDLOS
 fi