Ticket #4029: trac_4029.2.patch

sage-env

@@ -4 +4 @@
 #
 #  Set environment variables for building and/or running Sage.
 #  You must source this; see below!
-# 
+#
 #  AUTHORS:   William Stein                            2005-12
 #             David Kirkby <david.kirkby@onetel.net>   2005-12-17
 #
@@ -13 +13 @@
 ##########################################################################
 #
 #  If you want to set all environment variables for your shell like
-#  they are during the build of Sage packages, type 
+#  they are during the build of Sage packages, type
 #
-#             source local/bin/sage-env 
+#             source local/bin/sage-env
 #
 #  from the SAGE_ROOT directory.   To do the same from a /bin/bash
-#  script use ". local/bin/sage-env". 
-# 
+#  script use ". local/bin/sage-env".
+#
 ##########################################################################
 
 # GUESS SAGE_ROOT from pwd
 SAVEDIR="`pwd`"
 if [ -f sage -a -d spkg ]; then
     GUESSED_SAGE_ROOT="`pwd`"
-else 
+else
     if [ -f ../../sage -a -d ../../spkg ]; then
         cd ../../
         GUESSED_SAGE_ROOT="`pwd`"
@@ -42 +42 @@
         echo "Error: You must set the SAGE_ROOT environment"
         echo "variable or run this script from the SAGE_ROOT or "
         echo "SAGE_ROOT/local/bin/ directory."
-        exit 1
+        return 1 2>/dev/null || exit 1
     else
         SAGE_ROOT="$GUESSED_SAGE_ROOT"
         export SAGE_ROOT
@@ -57 +57 @@
         echo "Error: The SAGE_ROOT environment variable is set to"
         echo "a bad value. You must correct it or erase it and"
         echo "run this script from the SAGE_ROOT or"
-        echo "SAGE_ROOT/local/bin/ directory."  
-        exit 1
+        echo "SAGE_ROOT/local/bin/ directory."
+        return 1 2>/dev/null || exit 1
     fi
 fi
 
@@ -82 +82 @@
     echo "It is currently \"$SAGE_ROOT\"."
     echo "Please correct this by moving Sage (or renaming one or more directories) first."
     echo "Exiting now..."
-    exit 1
+    return 1 2>/dev/null || exit 1
 fi
 
 
@@ -210 +210 @@
 # The following is needed for openmpi:
 LD_LIBRARY_PATH="$SAGE_ROOT/local/lib/openmpi:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
 # The following is needed for R (in case the Sage install is moved):
-LD_LIBRARY_PATH="$SAGE_ROOT/local/lib/R/lib:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH  
+LD_LIBRARY_PATH="$SAGE_ROOT/local/lib/R/lib:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
 # The following is needed for OS X (especially for the
 # Singular install).
 if [ `uname` = "Darwin" ]; then
@@ -222 +222 @@
 fi
 
 if [ "$1" = "-short" ]; then
-    exit 0
+    return 0 2>/dev/null || exit 0
 fi
 
 if [ -z "$RHOME" ]; then
     RHOME="$SAGE_LOCAL/lib/R" && export RHOME
 fi
 
-# PKG_CONFIG_PATH is used by 'pkg-config' on Solaris and Linux, 
-# but at least some versions of OS X do not have the pkg-config 
-# command, so relying on this is not wise on OS X. 
+# PKG_CONFIG_PATH is used by 'pkg-config' on Solaris and Linux,
+# but at least some versions of OS X do not have the pkg-config
+# command, so relying on this is not wise on OS X.
 
 if [ -z "$PKG_CONFIG_PATH" ]; then
     PKG_CONFIG_PATH="$SAGE_LOCAL/lib/pkgconfig"
-    export PKG_CONFIG_PATH 
+    export PKG_CONFIG_PATH
 fi
 
 
@@ -245 +245 @@
 # This could be used in code to make special changes only when
 # code is being built as part of Sage.
 __sage__="" && export __sage__
-# Set the default compiler to gcc if the enviroment variable 
-# CC is not set. 
+# Set the default compiler to gcc if the enviroment variable
+# CC is not set.
 if [ "$CC" = "" ]; then
      CC="gcc"         && export CC
 fi
  # Set the default C++ compiler to g++ if the environment variable
-# CXX is not set. 
+# CXX is not set.
 if [ "$CXX" = "" ]; then
     CXX="g++"         && export CXX
 fi
@@ -277 +277 @@
 
 if [ "$SAGE64" = "" ]; then
     SAGE64="no"
-fi 
+fi
 
 if [ "$SAGE64" != "yes" -a "$SAGE64" != "no" ]; then
     echo "The environment variable SAGE64 (=$SAGE64) must be either unset, yes or no."
-    exit 1
+    return 1 2>/dev/null || exit 1
 fi
 
 # In case SAGE64 has been set to yes before re-inject it into the environment
@@ -309 +309 @@
 if [ "$RM" = "" ]; then
     RM="rm"  && export RM
 fi
- 
+
 if [ "$RANLIB" = "" ]; then
     RANLIB="ranlib"  && export RANLIB
 fi
- 
+
 if [ "$LN" = "" ]; then
     LN="ln"  && export LN
 fi
- 
+
 if [ "$MKDIR" = "" ]; then
     MKDIR="mkdir"  && export MKDIR
 fi
- 
+
 if [ "$CHMOD" = "" ]; then
     CHMOD="chmod"  && export CHMOD
 fi
- 
+
 if [ "$TOUCH" = "" ]; then
     TOUCH="touch"  && export TOUCH
 fi
@@ -341 +341 @@
 # See trac 7186 -- this is needed if ecl is moved
 ECLDIR="$SAGE_LOCAL/lib/ecl/" && export ECLDIR
 
-# Export variable names. 
+# Export variable names.
 export SHAREDFLAGS
 export UNAME
 export CC