Changeset 33006 for main

Show
Ignore:
Timestamp:
09.04.2019 19:46:01 (8 months 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/findjava.sh

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