Changeset 34259

Show
Ignore:
Timestamp:
10.07.2020 14:26:03 (4 weeks 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/client-gli.sh

    r31649 r34259  
    8383    if [ "$exit_status" -ne 1 ]; then 
    8484    local_gs="true" 
    85     fi  
     85    fi 
     86else 
     87    export GLIHOME=`pwd` 
     88    echo "@@@ Standalone client-gli, GLIHOME: $GLIHOME" 
     89    # GSDLOS would not have been set yet 
     90    if test "x$GSDLOS" = "x" ; then 
     91    GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
     92    # check for running bash under cygwin 
     93    if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; then 
     94        GSDLOS=windows 
     95    fi  
     96    fi 
     97    export GSDLOS 
    8698fi 
    8799 
  • main/trunk/gli/findjava.sh

    r33006 r34259  
    7070    if [ "x$GSDL3SRCHOME" != "x" ]; then 
    7171    HINT=`cd "$GSDL3SRCHOME";pwd`/packages/jre 
     72    elif [ "x$GLIHOME" != "x" ]; then 
     73    HINT=`cd "$GLIHOME";pwd`/packages/$GSDLOS/jre 
    7274    else 
    7375    HINT=`cd "$GSDLHOME";pwd`/packages/jre 
     
    157159MIN_DISPLAY_VERSION=1.4 
    158160 
     161echo "### GLIHOME: $GLIHOME" 
    159162# sus out search4j 
    160163# first look for compiled search4j executable inside the current folder 
     
    169172elif [ -x "../bin/search4j" ]; then 
    170173    SEARCH4J_EXECUTABLE=../bin/search4j 
     174elif [ "x$GLIHOME" != "x" ] && [ -x "$GLIHOME/bin/$GSDLOS/search4j" ]; then 
     175    SEARCH4J_EXECUTABLE=$GLIHOME/bin/$GSDLOS/search4j 
    171176else 
    172177    echo "Couldn't determine the location of the search4j executable"