src/bin/sage[-env]: Put SAGE_ROOT/src/bin in front of path only if ru…

…n out of this directory
sagemath · Nov 26, 2021 · 7519048 · 7519048
1 parent cc60cfe
commit 7519048
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/bin/sage b/src/bin/sage
@@ -298,6 +298,12 @@ if [ -f "${SELF}-env" ]; then
     fi
 fi
 
+if [ -f "${SELF}-src-env-config.in" ]; then
+    # The sage script is being run out of SAGE_ROOT/src/bin.
+    # In this case, put this directory in the front of the PATH.
+    export PATH="$SAGE_SRC/bin:$PATH"
+fi
+
 if [ -z "$DOT_SAGE" ]; then
     export DOT_SAGE="$HOME/.sage"
 fi

diff --git a/src/bin/sage-env b/src/bin/sage-env
@@ -295,9 +295,6 @@ fi
 if [ -n "$SAGE_VENV" ]; then
     export PATH="$SAGE_VENV/bin:$PATH"
 fi
-if [ -n "$SAGE_SRC" ]; then
-    export PATH="$SAGE_SRC/bin:$PATH"
-fi
 if [ -n "$SAGE_ROOT" ]; then
     export PATH="$SAGE_ROOT/build/bin:$PATH"
 fi