Changeset 26794 for main/trunk/greenstone2/setup.bash

Timestamp:

2013-01-29T16:20:36+13:00 (11 years ago)

Author:

davidb

Message:

GSDLOS now left alone if already set to something

File:

• main/trunk/greenstone2/setup.bash (modified) (1 diff)

main/trunk/greenstone2/setup.bash

@@ -150 +150 @@
   GSDLHOME=`pwd`
   export GSDLHOME
-  GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  # check for running bash under cygwin
-  if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
-  then
-    GSDLOS=windows
+
+  if test "x$GSDLOS" = "x" ; then
+    GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+    # check for running bash under cygwin
+    if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
+    then
+      GSDLOS=windows
+    fi
   fi
   export GSDLOS