1 files changed, 7 insertions, 7 deletions
diff --git a/webui.bat b/webui.bat
index d4d626e2..e6a7a429 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set VENV_DIR=venv)
+if not defined VENV_DIR (set VENV_DIR=%~dp0%venv)
 
 set ERROR_REPORTING=FALSE
 
@@ -13,20 +13,20 @@ echo Couldn't launch python
 goto :show_stdout_stderr
 
 :start_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
+dir "%VENV_DIR%\Scripts\Python.exe" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
 
 for /f "delims=" %%i in ('CALL %PYTHON% -c "import sys; print(sys.executable)"') do set PYTHON_FULLNAME="%%i"
 echo Creating venv in directory %VENV_DIR% using python %PYTHON_FULLNAME%
-%PYTHON_FULLNAME% -m venv %VENV_DIR% >tmp/stdout.txt 2>tmp/stderr.txt
+%PYTHON_FULLNAME% -m venv "%VENV_DIR%" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
-echo Unable to create venv in directory %VENV_DIR%
+echo Unable to create venv in directory "%VENV_DIR%"
 goto :show_stdout_stderr
 
 :activate_venv
-set PYTHON="%~dp0%VENV_DIR%\Scripts\Python.exe"
+set PYTHON="%VENV_DIR%\Scripts\Python.exe"
 echo venv %PYTHON%
 if [%ACCELERATE%] == ["True"] goto :accelerate
 goto :launch
@@ -35,7 +35,7 @@ goto :launch
 
 :accelerate
 echo "Checking for accelerate"
-set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+set ACCELERATE="%VENV_DIR%\Scripts\accelerate.exe"
 if EXIST %ACCELERATE% goto :accelerate_launch
 
 :launch