From 1fd2c22919f85e1403b7169d6ef8cc4abf4288cc Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Fri, 9 Sep 2022 08:37:19 +0300
Subject: brought manual instructions up to date reworked launching with
 different parameters

---
 webui.bat | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index 1d49fe4a..a7ed9c80 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,19 +1,14 @@
 @echo off
 
-set PYTHON=python
-set GIT=git
-set COMMANDLINE_ARGS=%*
-set VENV_DIR=venv
-
-if exist webui.settings.bat (
-    call webui.settings.bat
-)
+if not defined PYTHON (set PYTHON=python)
+if not defined GIT (set GIT=git)
+if not defined COMMANDLINE_ARGS (set COMMANDLINE_ARGS=%*)
+if not defined VENV_DIR (set VENV_DIR=venv)
+if not defined TORCH_COMMAND (set TORCH_COMMAND=pip install torch==1.12.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113)
+if not defined REQS_FILE (set REQS_FILE=requirements_versions.txt)
 
 mkdir tmp 2>NUL
 
-set TORCH_COMMAND=pip install torch==1.12.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113
-set REQS_FILE=requirements_versions.txt
-
 %PYTHON% -c "" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :check_git
 echo Couldn't launch python
@@ -26,7 +21,7 @@ echo Couldn't launch git
 goto :show_stdout_stderr
 
 :setup_venv
-if [%VENV_DIR%] == [] goto :skip_venv
+if [%VENV_DIR%] == [-] goto :skip_venv
 
 dir %VENV_DIR%\Scripts\Python.exe >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
-- 
cgit v1.2.3