Changeset 26795

Show
Ignore:
Timestamp:
29.01.2013 16:20:42 (6 years ago)
Author:
davidb
Message:

GSDLOS now left alone if already set to something

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.sh

    r25566 r26795  
    6666  export GSDL3SRCHOME 
    6767 
    68   GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
    69   # check for running bash under cygwin 
    70   if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; then 
    71     GSDLOS=windows 
    72   fi  
     68  if test "x$GSDLOS" = "x" ; then 
     69    GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
     70    # check for running bash under cygwin 
     71    if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; then 
     72      GSDLOS=windows 
     73    fi  
     74  fi 
    7375  export GSDLOS 
    7476  echo "  - Exported GSDL3HOME, GSDL3SRCHOME and GSDLOS"