revert webui.sh from #8492
This commit is contained in:
parent
27eedb6966
commit
6033de18bf
1 changed files with 14 additions and 14 deletions
28
webui.sh
28
webui.sh
|
@ -6,18 +6,19 @@
|
||||||
|
|
||||||
# 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 "$(dirname $0)/webui-macos-env.sh" ]]
|
if [[ -f webui-macos-env.sh ]]
|
||||||
then
|
then
|
||||||
source "$(dirname $0)/webui-macos-env.sh"
|
source ./webui-macos-env.sh
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Read variables from webui-user.sh
|
# Read variables from webui-user.sh
|
||||||
# shellcheck source=/dev/null
|
# shellcheck source=/dev/null
|
||||||
if [[ -f "$(dirname $0)/webui-user.sh" ]]
|
if [[ -f webui-user.sh ]]
|
||||||
then
|
then
|
||||||
source "$(dirname $0)/webui-user.sh"
|
source ./webui-user.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set defaults
|
# Set defaults
|
||||||
# Install directory without trailing slash
|
# Install directory without trailing slash
|
||||||
if [[ -z "${install_dir}" ]]
|
if [[ -z "${install_dir}" ]]
|
||||||
|
@ -46,12 +47,12 @@ 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}" ]]
|
||||||
then
|
then
|
||||||
venv_dir="${install_dir}/${clone_dir}/venv"
|
venv_dir="venv"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${LAUNCH_SCRIPT}" ]]
|
if [[ -z "${LAUNCH_SCRIPT}" ]]
|
||||||
then
|
then
|
||||||
LAUNCH_SCRIPT="${install_dir}/${clone_dir}/launch.py"
|
LAUNCH_SCRIPT="launch.py"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# this script cannot be run as root by default
|
# this script cannot be run as root by default
|
||||||
|
@ -139,23 +140,22 @@ then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -d "${install_dir}/${clone_dir}" ]]
|
cd "${install_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/, aborting...\e[0m" "${install_dir}"; exit 1; }
|
||||||
|
if [[ -d "${clone_dir}" ]]
|
||||||
then
|
then
|
||||||
|
cd "${clone_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/%s/, aborting...\e[0m" "${install_dir}" "${clone_dir}"; exit 1; }
|
||||||
|
else
|
||||||
printf "\n%s\n" "${delimiter}"
|
printf "\n%s\n" "${delimiter}"
|
||||||
printf "Clone stable-diffusion-webui"
|
printf "Clone stable-diffusion-webui"
|
||||||
printf "\n%s\n" "${delimiter}"
|
printf "\n%s\n" "${delimiter}"
|
||||||
mkdir -p "${install_dir}"
|
"${GIT}" clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git "${clone_dir}"
|
||||||
"${GIT}" clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git "${install_dir}/${clone_dir}"
|
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
|
||||||
|
|
||||||
printf "\n%s\n" "${delimiter}"
|
printf "\n%s\n" "${delimiter}"
|
||||||
printf "Create and activate python venv"
|
printf "Create and activate python venv"
|
||||||
printf "\n%s\n" "${delimiter}"
|
printf "\n%s\n" "${delimiter}"
|
||||||
# Make venv_dir absolute
|
cd "${install_dir}"/"${clone_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/%s/, aborting...\e[0m" "${install_dir}" "${clone_dir}"; exit 1; }
|
||||||
if [[ "${venv_dir}" != /* ]]
|
|
||||||
then
|
|
||||||
venv_dir="${install_dir}/${clone_dir}/${venv_dir}"
|
|
||||||
fi
|
|
||||||
if [[ ! -d "${venv_dir}" ]]
|
if [[ ! -d "${venv_dir}" ]]
|
||||||
then
|
then
|
||||||
"${python_cmd}" -m venv "${venv_dir}"
|
"${python_cmd}" -m venv "${venv_dir}"
|
||||||
|
|
Loading…
Reference in a new issue