Commit 2b42f73e authored by kopyl's avatar kopyl
Browse files

Make possible to install web ui without venv with --novenv flag

When passing `--novenv` flag to webui.sh it can skip venv.
Might be useful for installing in Docker since messing with venv in Docker might be a bit complicated.

Example usage:
`webui.sh --novenv`

Hope this gets approved and pushed into future versions of Web UI
parent f865d3e1
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@
# change the variables in webui-user.sh instead #
#################################################

usevenv=1
if [[ $@ == *"--novenv"* ]]; then
  usevenv=0
fi

# If run from macOS, load defaults from webui-macos-env.sh
if [[ "$OSTYPE" == "darwin"* ]]; then
    if [[ -f webui-macos-env.sh ]]
@@ -45,7 +50,7 @@ then
fi

# python3 venv without trailing slash (defaults to ${install_dir}/${clone_dir}/venv)
if [[ -z "${venv_dir}" ]]
if [[ -z "${venv_dir}" ]] && [[ $usevenv -eq 1 ]]
then
    venv_dir="venv"
fi
@@ -158,7 +163,7 @@ do
    fi
done

if ! "${python_cmd}" -c "import venv" &>/dev/null
if [[ $usevenv -eq 1 ]] && ! "${python_cmd}" -c "import venv" &>/dev/null
then
    printf "\n%s\n" "${delimiter}"
    printf "\e[1m\e[31mERROR: python3-venv is not installed, aborting...\e[0m"
@@ -178,7 +183,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; }
fi

if [[ -z "${VIRTUAL_ENV}" ]];
if [[ $usevenv -eq 1 ]] && [[ -z "${VIRTUAL_ENV}" ]];
then
    printf "\n%s\n" "${delimiter}"
    printf "Create and activate python venv"
@@ -201,7 +206,7 @@ then
    fi
else
    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}"
fi