build/bin/sage-print-system-package-command: If system=auto, use sage…

…-guess-package-system
sagemath · May 20, 2022 · 798f4d3 · 798f4d3
1 parent ab5a4f1
commit 798f4d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build/bin/sage-print-system-package-command b/build/bin/sage-print-system-package-command
@@ -48,10 +48,17 @@ done
 command=$1
 shift
 if [ -z "$system" -o -z "$command" ]; then
-    echo >&2 "usage: $0 {debian|arch|conda|...} [--verbose] [--sudo] [--prompt] {update|install|setup-build-env|remove|...} PACKAGES..."
+    echo >&2 "usage: $0 {auto|debian|arch|conda|...} [--verbose] [--sudo] [--prompt] {update|install|setup-build-env|remove|...} PACKAGES..."
     exit 1
 fi
 system_packages="$*"
+if [ "$system" = auto ]; then
+    system=$(sage-guess-package-system 2>/dev/null)
+    if [ "$system" = unknown ]; then
+        echo >&2 "unknown package system"
+        exit 1
+    fi
+fi
 options=
 env=
 shopt -s extglob

diff --git a/tox.ini b/tox.ini
@@ -180,7 +180,7 @@ setenv =
     # local envs need HOME set, also Docker 19.03 needs HOME
     {local,docker}: HOME={envdir}
     # for local envs we can guess the package system if it is not provided as a factor
-    local:          SYSTEM=$(build/bin/sage-guess-package-system)
+    local:          SYSTEM=auto
     #
     # default tag is "latest"
     #