From b363a8866e334280598800e4b963a618dd90d3b4 Mon Sep 17 00:00:00 2001 From: litagin02 Date: Sat, 16 Mar 2024 18:03:04 +0900 Subject: [PATCH] Remove debugging pause --- scripts/Install-Style-Bert-VITS2-CPU.bat | 9 --------- scripts/Install-Style-Bert-VITS2.bat | 10 ---------- scripts/Setup-Python.bat | 15 ++------------- scripts/Update-Style-Bert-VITS2.bat | 3 --- 4 files changed, 2 insertions(+), 35 deletions(-) diff --git a/scripts/Install-Style-Bert-VITS2-CPU.bat b/scripts/Install-Style-Bert-VITS2-CPU.bat index 9fd6008..1af4ae4 100644 --- a/scripts/Install-Style-Bert-VITS2-CPU.bat +++ b/scripts/Install-Style-Bert-VITS2-CPU.bat @@ -39,7 +39,6 @@ if !errorlevel! neq 0 ( echo Downloading PortableGit... echo -------------------------------------------------- echo Executing: curl -L %DL_URL% -o "%DL_DST%" - pause curl -L %DL_URL% -o "%DL_DST%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -47,7 +46,6 @@ if !errorlevel! neq 0 ( echo Extracting PortableGit... echo -------------------------------------------------- echo Executing: "%DL_DST%" -y - pause "%DL_DST%" -y if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -55,7 +53,6 @@ if !errorlevel! neq 0 ( echo Removing %DL_DST%... echo -------------------------------------------------- echo Executing: del "%DL_DST%" - pause del "%DL_DST%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -64,7 +61,6 @@ if !errorlevel! neq 0 ( echo Setting up PATH... echo -------------------------------------------------- echo Executing: set "PATH=%~dp0lib\PortableGit\bin;%PATH%" - pause set "PATH=%~dp0lib\PortableGit\bin;%PATH%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -72,7 +68,6 @@ if !errorlevel! neq 0 ( echo Checking Git Installation... echo -------------------------------------------------- echo Executing: git --version - pause git --version if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) ) @@ -81,7 +76,6 @@ echo -------------------------------------------------- echo Cloning repository... echo -------------------------------------------------- echo Executing: git clone %REPO_URL% -pause git clone %REPO_URL% if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -90,7 +84,6 @@ echo -------------------------------------------------- echo Setting up Python environment... echo -------------------------------------------------- echo Executing: call Setup-Python.bat ".\lib\python" ".\Style-Bert-VITS2\venv" -pause call Setup-Python.bat ".\lib\python" ".\Style-Bert-VITS2\venv" if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @@ -101,7 +94,6 @@ echo -------------------------------------------------- echo Activating the virtual environment... echo -------------------------------------------------- echo Executing: call ".\venv\Scripts\activate.bat" -pause call ".\venv\Scripts\activate.bat" if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @@ -109,7 +101,6 @@ echo -------------------------------------------------- echo Installing dependencies... echo -------------------------------------------------- echo Executing: pip install -r requirements.txt -pause pip install -r requirements.txt if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) diff --git a/scripts/Install-Style-Bert-VITS2.bat b/scripts/Install-Style-Bert-VITS2.bat index 6868863..336d8da 100644 --- a/scripts/Install-Style-Bert-VITS2.bat +++ b/scripts/Install-Style-Bert-VITS2.bat @@ -39,7 +39,6 @@ if !errorlevel! neq 0 ( echo Downloading PortableGit... echo -------------------------------------------------- echo Executing: curl -L %DL_URL% -o "%DL_DST%" - pause curl -L %DL_URL% -o "%DL_DST%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -47,7 +46,6 @@ if !errorlevel! neq 0 ( echo Extracting PortableGit... echo -------------------------------------------------- echo Executing: "%DL_DST%" -y - pause "%DL_DST%" -y if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -55,7 +53,6 @@ if !errorlevel! neq 0 ( echo Removing %DL_DST%... echo -------------------------------------------------- echo Executing: del "%DL_DST%" - pause del "%DL_DST%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -64,7 +61,6 @@ if !errorlevel! neq 0 ( echo Setting up PATH... echo -------------------------------------------------- echo Executing: set "PATH=%~dp0lib\PortableGit\bin;%PATH%" - pause set "PATH=%~dp0lib\PortableGit\bin;%PATH%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -72,7 +68,6 @@ if !errorlevel! neq 0 ( echo Checking Git Installation... echo -------------------------------------------------- echo Executing: git --version - pause git --version if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) ) @@ -81,7 +76,6 @@ echo -------------------------------------------------- echo Cloning repository... echo -------------------------------------------------- echo Executing: git clone %REPO_URL% -pause git clone %REPO_URL% if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -90,7 +84,6 @@ echo -------------------------------------------------- echo Setting up Python environment... echo -------------------------------------------------- echo Executing: call Setup-Python.bat ".\lib\python" ".\Style-Bert-VITS2\venv" -pause call Setup-Python.bat ".\lib\python" ".\Style-Bert-VITS2\venv" if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @@ -101,7 +94,6 @@ echo -------------------------------------------------- echo Activating the virtual environment... echo -------------------------------------------------- echo Executing: call ".\venv\Scripts\activate.bat" -pause call ".\venv\Scripts\activate.bat" if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @@ -109,7 +101,6 @@ echo -------------------------------------------------- echo Installing PyTorch... echo -------------------------------------------------- echo Executing: pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 -pause pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -117,7 +108,6 @@ echo -------------------------------------------------- echo Installing other dependencies... echo -------------------------------------------------- echo Executing: pip install -r requirements.txt -pause pip install -r requirements.txt if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) diff --git a/scripts/Setup-Python.bat b/scripts/Setup-Python.bat index 4c30ce7..97fc339 100644 --- a/scripts/Setup-Python.bat +++ b/scripts/Setup-Python.bat @@ -34,15 +34,13 @@ echo PYTHON_CMD: %PYTHON_CMD% echo PYTHON_DIR: %PYTHON_DIR% echo VENV_DIR: %VENV_DIR% echo -------------------------------------------------- - -pause +echo. if not exist "%PYTHON_DIR%"\ ( echo -------------------------------------------------- echo Downloading Python... echo -------------------------------------------------- echo Executing: %CURL_CMD% -o python.zip https://www.python.org/ftp/python/3.10.11/python-3.10.11-embed-amd64.zip - pause %CURL_CMD% -o python.zip https://www.python.org/ftp/python/3.10.11/python-3.10.11-embed-amd64.zip if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -50,7 +48,6 @@ if not exist "%PYTHON_DIR%"\ ( echo Extracting zip... echo -------------------------------------------------- echo Executing: %PS_CMD% Expand-Archive -Path python.zip -DestinationPath \"%PYTHON_DIR%\" - pause %PS_CMD% Expand-Archive -Path python.zip -DestinationPath \"%PYTHON_DIR%\" if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -58,7 +55,6 @@ if not exist "%PYTHON_DIR%"\ ( echo Removing python.zip... echo -------------------------------------------------- echo Executing: del python.zip - pause del python.zip if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -66,7 +62,6 @@ if not exist "%PYTHON_DIR%"\ ( echo Enabling 'site' module in the embedded Python environment... echo -------------------------------------------------- echo Executing: %PS_CMD% "&{(Get-Content '%PYTHON_DIR%/python310._pth') -creplace '#import site', 'import site' | Set-Content '%PYTHON_DIR%/python310._pth' }" - pause %PS_CMD% "&{(Get-Content '%PYTHON_DIR%/python310._pth') -creplace '#import site', 'import site' | Set-Content '%PYTHON_DIR%/python310._pth' }" if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -74,7 +69,6 @@ if not exist "%PYTHON_DIR%"\ ( echo Installing pip and virtualenv... echo -------------------------------------------------- echo Executing: %CURL_CMD% -o "%PYTHON_DIR%\get-pip.py" https://bootstrap.pypa.io/get-pip.py - pause %CURL_CMD% -o "%PYTHON_DIR%\get-pip.py" https://bootstrap.pypa.io/get-pip.py if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -82,7 +76,6 @@ if not exist "%PYTHON_DIR%"\ ( echo Installing pip... echo -------------------------------------------------- echo Executing: "%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location - pause "%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -90,7 +83,6 @@ if not exist "%PYTHON_DIR%"\ ( echo Installing virtualenv... echo -------------------------------------------------- echo Executing: "%PYTHON_CMD%" -m pip install virtualenv --no-warn-script-location - pause "%PYTHON_CMD%" -m pip install virtualenv --no-warn-script-location if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) ) @@ -100,7 +92,6 @@ if not exist %VENV_DIR%\ ( echo Creating virtual environment... echo -------------------------------------------------- echo Executing: "%PYTHON_CMD%" -m virtualenv --copies "%VENV_DIR%" - pause "%PYTHON_CMD%" -m virtualenv --copies "%VENV_DIR%" if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) ) @@ -109,7 +100,6 @@ echo -------------------------------------------------- echo Activating virtual environment... echo -------------------------------------------------- echo Executing: call "%VENV_DIR%\Scripts\activate.bat" -pause call "%VENV_DIR%\Scripts\activate.bat" if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -117,7 +107,6 @@ echo -------------------------------------------------- echo Upgrading pip... echo -------------------------------------------------- echo Executing: python -m pip install --upgrade pip -pause python -m pip install --upgrade pip if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) @@ -125,4 +114,4 @@ echo -------------------------------------------------- echo Completed. echo -------------------------------------------------- -pause \ No newline at end of file +pause diff --git a/scripts/Update-Style-Bert-VITS2.bat b/scripts/Update-Style-Bert-VITS2.bat index 271fc17..2c8d0e8 100644 --- a/scripts/Update-Style-Bert-VITS2.bat +++ b/scripts/Update-Style-Bert-VITS2.bat @@ -19,7 +19,6 @@ if !errorlevel! neq 0 ( echo Setting up PATH... echo -------------------------------------------------- echo Executing: set "PATH=%~dp0lib\PortableGit\bin;%PATH%" - pause set "PATH=%~dp0lib\PortableGit\bin;%PATH%" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @@ -27,7 +26,6 @@ if !errorlevel! neq 0 ( echo Checking Git Installation... echo -------------------------------------------------- echo Executing: git --version - pause git --version if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) ) @@ -46,7 +44,6 @@ echo -------------------------------------------------- echo Activating virtual environment... echo -------------------------------------------------- echo Executing: call ".\venv\Scripts\activate.bat" -pause call ".\venv\Scripts\activate.bat" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! )