Ticket #5155: 5155_root.patch

spkg/bin/sage

@@ -285 +285 @@
         cat "$SAGE_LOCAL/bin/sage-banner"
     fi
 
-    # Check to see if the whole Sage install tree has moved.
-    # If so, change various hardcoded paths.
-    sage-location || exit $?
+    # Check to see if the whole Sage install tree has moved.  If so,
+    # change various hardcoded paths.  Skip this if we don't have write
+    # access to $SAGE_LOCAL (e.g. when running as a different user).
+    if [ -w "$SAGE_LOCAL" ]; then
+        sage-location || exit $?
+    fi
 
     export IPYTHONDIR="$DOT_SAGE/ipython"
     export IPYTHONRC="ipythonrc"
@@ -782 +785 @@
       touch "$DOT_SAGE"/init.sage
    fi
    shift
+   SAGE_BANNER="no"
+   sage_setup
    sage-test "$@"
    exit $?
 fi
@@ -795 +800 @@
       touch "$DOT_SAGE"/init.sage
    fi
    shift
+   SAGE_BANNER="no"
+   sage_setup
    sage-ptest "$@"
    exit $?
 fi
@@ -804 +811 @@
       build_sage
    fi
    shift
+   SAGE_BANNER="no"
+   sage_setup
    sage-test-new "$@"
    exit $?
 fi
 
 if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
    shift
+   SAGE_BANNER="no"
+   sage_setup
    sage-maketest "$@"
    exit $?
 fi
@@ -906 +917 @@
 
 if [ "$1" = '-info' -o "$1" = '--info' ]; then
     shift
-    # If there are no further arguments, simply list all installed
-    # packages.
-    if [ $# -eq 0 ]; then
-        exec sage-spkg
-    fi
-    install --info "$@"
+    for PKG in "$@"
+    do
+        sage-spkg --info "$PKG" || exit $?
+    done
+    exit 0
 fi
 
 if [ "$1" = '-pkg' -o "$1" = '-spkg' -o "$1" = "--pkg" -o "$1" = "--spkg" ]; then
@@ -972 +982 @@
     # People often move the Sage install right before doing the upgrade, so it's
     # important to fix any path hardcoding issues first, or certain library
     # links will fail.
-    sage-location
+    sage-location || exit $?
 
     # Run sage-upgrade twice since when installing sage-scripts and a
     # running script changes, it gets confused and exits with an error.