Changeset 34259 for main/trunk

Timestamp:

2020-07-10T14:26:03+12:00 (4 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.

Location:

main/trunk/gli

Files:

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

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
 

main/trunk/gli/findjava.sh

@@ -70 +70 @@
     if [ "x$GSDL3SRCHOME" != "x" ]; then
     HINT=`cd "$GSDL3SRCHOME";pwd`/packages/jre
+    elif [ "x$GLIHOME" != "x" ]; then
+    HINT=`cd "$GLIHOME";pwd`/packages/$GSDLOS/jre
     else
     HINT=`cd "$GSDLHOME";pwd`/packages/jre
@@ -157 +159 @@
 MIN_DISPLAY_VERSION=1.4
 
+echo "### GLIHOME: $GLIHOME"
 # sus out search4j
 # first look for compiled search4j executable inside the current folder
@@ -169 +172 @@
 elif [ -x "../bin/search4j" ]; then
     SEARCH4J_EXECUTABLE=../bin/search4j
+elif [ "x$GLIHOME" != "x" ] && [ -x "$GLIHOME/bin/$GSDLOS/search4j" ]; then
+    SEARCH4J_EXECUTABLE=$GLIHOME/bin/$GSDLOS/search4j
 else
     echo "Couldn't determine the location of the search4j executable"