Merge pull request #16092 from viking1304/bash-python-version

Prioritize python3.10 over python3 if both are available on Linux and Mac (with fallback)
AUTOMATIC1111 · Jul 6, 2024 · b9c3f4e · b9c3f4e
2 parents 41ac139 + ec3c31e
commit b9c3f4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/webui-macos-env.sh b/webui-macos-env.sh
@@ -4,11 +4,6 @@
 # Please modify webui-user.sh to change these instead of this file #
 ####################################################################
 
-if [[ -x "$(command -v python3.10)" ]]
-then
-    python_cmd="python3.10"
-fi
-
 export install_dir="$HOME"
 export COMMANDLINE_ARGS="--skip-torch-cuda-test --upcast-sampling --no-half-vae --use-cpu interrogate"
 export PYTORCH_ENABLE_MPS_FALLBACK=1

diff --git a/webui.sh b/webui.sh
@@ -44,7 +44,11 @@ fi
 # python3 executable
 if [[ -z "${python_cmd}" ]]
 then
-    python_cmd="python3"
+  python_cmd="python3.10"
+fi
+if [[ ! -x "$(command -v "${python_cmd}")" ]]
+then
+  python_cmd="python3"
 fi
 
 # git executable