Unverified Commit 362675e7 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #13469 from PermissionDenied7335/master

I found a code snippet in webui.sh that disables python venv and moved it to the appropriate location
parents e3c849da 6ab0b65e
Loading
Loading
Loading
Loading
+6 −6
Original line number Original line Diff line number Diff line
@@ -4,12 +4,6 @@
# 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 )




@@ -28,6 +22,12 @@ then
    source "$SCRIPT_DIR"/webui-user.sh
    source "$SCRIPT_DIR"/webui-user.sh
fi
fi


# If $venv_dir is "-", then disable venv support
use_venv=1
if [[ $venv_dir == "-" ]]; then
  use_venv=0
fi

# Set defaults
# Set defaults
# Install directory without trailing slash
# Install directory without trailing slash
if [[ -z "${install_dir}" ]]
if [[ -z "${install_dir}" ]]