Changeset 34259
- Timestamp:
- 2020-07-10T14:26:03+12:00 (4 years ago)
- Location:
- main/trunk/gli
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/client-gli.sh
r31649 r34259 83 83 if [ "$exit_status" -ne 1 ]; then 84 84 local_gs="true" 85 fi 85 fi 86 else 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 86 98 fi 87 99 -
main/trunk/gli/findjava.sh
r33006 r34259 70 70 if [ "x$GSDL3SRCHOME" != "x" ]; then 71 71 HINT=`cd "$GSDL3SRCHOME";pwd`/packages/jre 72 elif [ "x$GLIHOME" != "x" ]; then 73 HINT=`cd "$GLIHOME";pwd`/packages/$GSDLOS/jre 72 74 else 73 75 HINT=`cd "$GSDLHOME";pwd`/packages/jre … … 157 159 MIN_DISPLAY_VERSION=1.4 158 160 161 echo "### GLIHOME: $GLIHOME" 159 162 # sus out search4j 160 163 # first look for compiled search4j executable inside the current folder … … 169 172 elif [ -x "../bin/search4j" ]; then 170 173 SEARCH4J_EXECUTABLE=../bin/search4j 174 elif [ "x$GLIHOME" != "x" ] && [ -x "$GLIHOME/bin/$GSDLOS/search4j" ]; then 175 SEARCH4J_EXECUTABLE=$GLIHOME/bin/$GSDLOS/search4j 171 176 else 172 177 echo "Couldn't determine the location of the search4j executable"
Note:
See TracChangeset
for help on using the changeset viewer.