Changeset 26794

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

GSDLOS now left alone if already set to something

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bash

    r24610 r26794  
    150150  GSDLHOME=`pwd` 
    151151  export GSDLHOME 
    152   GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
    153   # check for running bash under cygwin 
    154   if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; 
    155   then 
    156     GSDLOS=windows 
     152 
     153  if test "x$GSDLOS" = "x" ; then 
     154    GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
     155    # check for running bash under cygwin 
     156    if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ; 
     157    then 
     158      GSDLOS=windows 
     159    fi 
    157160  fi 
    158161  export GSDLOS