src/bin/sage: Handle -b... options before sourcing sage-env

Author: Matthias Koeppe

src/bin/sage

@@ -216,6 +216,13 @@ if [ "$1" = '-patchbot' -o "$1" = "--patchbot" ]; then
     exit 127
 fi
 
+# build_sage, sage -b, sage -br, etc. could also be moved to
+# build/bin/sage-site. See #29111; but OTOH #34627.
+
+build_sage() {
+    ( cd "$SAGE_ROOT" && make sagelib-no-deps ) || exit $?
+}
+
 # Check for '-i' etc. before sourcing sage-env: running "make"
 # should be run outside of the Sage shell.
 case "$1" in
@@ -229,6 +236,28 @@ case "$1" in
         echo >&2 "Error: unknown option: $1"
         exit 1
         ;;
+    -b)
+        build_sage
+        exit 0
+        ;;
+    -br|--br)
+        build_sage
+        shift; set -- -r "$@"  # delegate to handling of "-r" below, after sourcing sage-env
+        ;;
+    -bn|--build-and-notebook)
+        build_sage
+        shift; set -- -n "$@"  # delegate to handling of "-n" below, after sourcing sage-env
+        ;;
+    -ba)
+        ( cd "$SAGE_ROOT" && make sagelib-clean )
+        build_sage
+        exit 0
+        ;;
+    -bt*)
+        build_sage
+        switch_without_b=-${1#-b}
+        shift; set -- $switch_without_b "$@"  # delegate to handling of "-t...." below, after sourcing sage-env
+        ;;
 esac
 
 #####################################################################
@@ -865,12 +894,6 @@ fi
 # The notebook, grep, building Sage, testing Sage
 #####################################################################
 
-# build_sage, sage -b, sage -br, etc. could be moved to
-# build/bin/sage-site. See #29111.
-
-build_sage() {
-    ( cd "$SAGE_ROOT" && make sagelib-no-deps ) || exit $?
-}
 
 if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
     sage-cleaner &>/dev/null &
@@ -905,47 +928,19 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
     fi
 fi
 
-if [ "$1" = '-b' ]; then
-    build_sage
-    exit $?
-fi
-
-if [ "$1" = '-br' -o "$1" = "--br" ]; then
-    build_sage
-    interactive_sage
-fi
-
 if [ "$1" = '-r' ]; then
     shift
     interactive_sage
 fi
 
-if [ "$1" = '-ba-force' -o "$1" = '--ba-force' ]; then
-    echo
-    echo "WARNING: 'sage --ba-force' is deprecated; use 'sage -ba' instead."
-    echo
-    ( cd "$SAGE_ROOT" && make sagelib-clean )
-    build_sage
-    exit $?
-fi
-
-if [ "$1" = '-ba' ]; then
-    ( cd "$SAGE_ROOT" && make sagelib-clean )
-    build_sage
-    exit $?
-fi
-
 exec-runtests() {
     sage_setup
     export PYTHONIOENCODING="utf-8"  # Fix encoding for doctests
     exec sage-runtests "$@"
 }
 
-if [ "$1" = '-t' -o "$1" = '-bt' -o "$1" = '-tp' -o "$1" = '-btp' ]; then
-    if [ "$1" = '-bt' -o "$1" = '-btp' ]; then
-        build_sage
-    fi
-    if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
+if [ "$1" = '-t' -o "$1" = '-tp' ]; then
+    if [ "$1" = '-tp' ]; then
         shift
         exec-runtests -p "$@"
     else
@@ -954,10 +949,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1" = '-tp' -o "$1" = '-btp' ]; then
     fi
 fi
 
-if [ "$1" = '-tnew' -o "$1" = '-btnew' ]; then
-    if [ "$1" = '-btnew' ]; then
-        build_sage
-    fi
+if [ "$1" = '-tnew' ]; then
     shift
     exec-runtests --new "$@"
 fi