Mirror/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-06-07 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11866 from kopyl/allow-no-venv-install

Browse Source 
Make possible to install web ui without venv with venv_dir=- env variable for Linux
This commit is contained in:
AUTOMATIC1111 2023-07-19 08:00:05 +03:00 committed by GitHub
commit d5c850aab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webui.sh
View File

@ -4,8 +4,15 @@
# change the variables in webui-user.sh instead # # change the variables in webui-user.sh instead #
################################################# #################################################
use_venv=1
if [[ $venv_dir == "-" ]]; then
use_venv=0
fi
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# If run from macOS, load defaults from webui-macos-env.sh # If run from macOS, load defaults from webui-macos-env.sh
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
if [[ -f "$SCRIPT_DIR"/webui-macos-env.sh ]] if [[ -f "$SCRIPT_DIR"/webui-macos-env.sh ]]
@ -47,7 +54,7 @@ then
fi fi
# python3 venv without trailing slash (defaults to ${install_dir}/${clone_dir}/venv) # python3 venv without trailing slash (defaults to ${install_dir}/${clone_dir}/venv)
if [[ -z "${venv_dir}" ]] if [[ -z "${venv_dir}" ]] && [[ $use_venv -eq 1 ]]
then then
venv_dir="venv" venv_dir="venv"
fi fi
@ -164,7 +171,7 @@ do
fi fi
done done
if ! "${python_cmd}" -c "import venv" &>/dev/null if [[ $use_venv -eq 1 ]] && ! "${python_cmd}" -c "import venv" &>/dev/null
then then
printf "\n%s\n" "${delimiter}" printf "\n%s\n" "${delimiter}"
printf "\e[1m\e[31mERROR: python3-venv is not installed, aborting...\e[0m" printf "\e[1m\e[31mERROR: python3-venv is not installed, aborting...\e[0m"
@ -184,7 +191,7 @@ else
cd "${clone_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/%s/, aborting...\e[0m" "${install_dir}" "${clone_dir}"; exit 1; } cd "${clone_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/%s/, aborting...\e[0m" "${install_dir}" "${clone_dir}"; exit 1; }
fi fi
if [[ -z "${VIRTUAL_ENV}" ]]; if [[ $use_venv -eq 1 ]] && [[ -z "${VIRTUAL_ENV}" ]];
then then
printf "\n%s\n" "${delimiter}" printf "\n%s\n" "${delimiter}"
printf "Create and activate python venv" printf "Create and activate python venv"
@ -207,7 +214,7 @@ then
fi fi
else else
printf "\n%s\n" "${delimiter}" printf "\n%s\n" "${delimiter}"
printf "python venv already activate: ${VIRTUAL_ENV}" printf "python venv already activate or run without venv: ${VIRTUAL_ENV}"
printf "\n%s\n" "${delimiter}" printf "\n%s\n" "${delimiter}"
fi fi