Merge remote-tracking branch 'origin/master'

launch.py

@@ -123,5 +123,5 @@ def start_webui():
     import webui
     webui.webui()
 
-
-start_webui()
+if __name__ == "__main__":
+    start_webui()

webui-user.sh

 #!/bin/bash
-###########################################
-# Change the variables below to your need:#
-###########################################
+#########################################################
+# Uncomment and change the variables below to your need:#
+#########################################################
 
 # Install directory without trailing slash
-install_dir="/home/$(whoami)"
+#install_dir="/home/$(whoami)"
 
-# Name of the subdirectory (defaults to stable-diffusion-webui)
-clone_dir="stable-diffusion-webui"
+# Name of the subdirectory
+#clone_dir="stable-diffusion-webui"
 
-# Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS=(--medvram --opt-split-attention)
+# Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS="--medvram --opt-split-attention"
 export COMMANDLINE_ARGS=""
 
 # python3 executable
-python_cmd="python3"
+#python_cmd="python3"
 
 # git executable
-#export GIT=""
+#export GIT="git"
 
 # python3 venv without trailing slash (defaults to ${install_dir}/${clone_dir}/venv)
-venv_dir="venv"
+#venv_dir="venv"
 
 # install command for torch
-export TORCH_COMMAND="pip install torch==1.12.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113"
+#export TORCH_COMMAND="pip install torch==1.12.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113"
 
 # Requirements file to use for stable-diffusion-webui
-#export REQS_FILE=""
+#export REQS_FILE="requirements_versions.txt"
 
 # Fixed git repos
 #export K_DIFFUSION_PACKAGE=""