Changeset 33006 for main/trunk

Timestamp:

2019-04-09T19:46:01+12:00 (5 years ago)

Author:

ak19

Message:

findjava.sh wasn't doing the additional step in findjava.bat: findjava.sh needed to set the bundled JRE path correctly for GS3 if a GS3 instalation, which is a slightly different path from the bundled JRE of GS2

File:

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

main/trunk/gli/findjava.sh

@@ -68 +68 @@
     # Give search4j a hint to find Java depending on the platform
     # we now include a JRE with Mac (Mountain) Lion, because from Yosemite onwards there's no system Java on Macs
-    HINT=`cd "$GSDLHOME";pwd`/packages/jre    
+    if [ "x$GSDL3SRCHOME" != "x" ]; then
+    HINT=`cd "$GSDL3SRCHOME";pwd`/packages/jre
+    else
+    HINT=`cd "$GSDLHOME";pwd`/packages/jre
+    fi
     
     # we can't use boolean operator -a to do the AND, since it doesn't "short-circuit" if the first test fails