diff --git a/scripts/Install-Style-Bert-VITS2-CPU.bat b/scripts/Install-Style-Bert-VITS2-CPU.bat index f922688..a4a26b3 100644 --- a/scripts/Install-Style-Bert-VITS2-CPU.bat +++ b/scripts/Install-Style-Bert-VITS2-CPU.bat @@ -1,6 +1,8 @@ chcp 65001 > NUL @echo off -setlocal + +@REM エラーコードを遅延評価するために設定 +setlocal enabledelayedexpansion @REM PowerShellのコマンド set PS_CMD=PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass @@ -31,7 +33,7 @@ echo -------------------------------------------------- echo Executing: git --version pause git --version -if %errorlevel% neq 0 ( +if !errorlevel! neq 0 ( echo -------------------------------------------------- echo Git is not installed, so download and use PortableGit. echo Downloading PortableGit... @@ -39,7 +41,7 @@ if %errorlevel% neq 0 ( 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% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Extracting PortableGit... @@ -47,7 +49,7 @@ if %errorlevel% neq 0 ( echo Executing: "%DL_DST%" -y pause "%DL_DST%" -y - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Removing %DL_DST%... @@ -55,7 +57,7 @@ if %errorlevel% neq 0 ( echo Executing: del "%DL_DST%" pause del "%DL_DST%" - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @REM Gitコマンドのパスを設定 echo -------------------------------------------------- @@ -64,7 +66,7 @@ if %errorlevel% neq 0 ( echo Executing: set "PATH=%~dp0lib\PortableGit\bin;%PATH%" pause set "PATH=%~dp0lib\PortableGit\bin;%PATH%" - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Checking Git Installation... @@ -72,7 +74,7 @@ if %errorlevel% neq 0 ( echo Executing: git --version pause git --version - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) ) echo -------------------------------------------------- @@ -81,7 +83,7 @@ echo -------------------------------------------------- echo Executing: git clone %REPO_URL% pause git clone %REPO_URL% -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @REM Pythonのセットアップ、仮想環境が有効化されて戻って来る echo -------------------------------------------------- @@ -90,7 +92,7 @@ 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% ) +if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @REM Style-Bert-VITS2フォルダに移動 pushd Style-Bert-VITS2 @@ -101,7 +103,7 @@ echo -------------------------------------------------- echo Executing: pip install -r requirements.txt pause pip install -r requirements.txt -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo ---------------------------------------- echo Environment setup is complete. Start downloading the model. diff --git a/scripts/Install-Style-Bert-VITS2.bat b/scripts/Install-Style-Bert-VITS2.bat index 43e6ea7..1daa00e 100644 --- a/scripts/Install-Style-Bert-VITS2.bat +++ b/scripts/Install-Style-Bert-VITS2.bat @@ -1,6 +1,8 @@ chcp 65001 > NUL @echo off -setlocal + +@REM エラーコードを遅延評価するために設定 +setlocal enabledelayedexpansion @REM PowerShellのコマンド set PS_CMD=PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass @@ -31,7 +33,7 @@ echo -------------------------------------------------- echo Executing: git --version pause git --version -if %errorlevel% neq 0 ( +if !errorlevel! neq 0 ( echo -------------------------------------------------- echo Git is not installed, so download and use PortableGit. echo Downloading PortableGit... @@ -39,7 +41,7 @@ if %errorlevel% neq 0 ( 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% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Extracting PortableGit... @@ -47,7 +49,7 @@ if %errorlevel% neq 0 ( echo Executing: "%DL_DST%" -y pause "%DL_DST%" -y - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Removing %DL_DST%... @@ -55,7 +57,7 @@ if %errorlevel% neq 0 ( echo Executing: del "%DL_DST%" pause del "%DL_DST%" - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @REM Gitコマンドのパスを設定 echo -------------------------------------------------- @@ -64,7 +66,7 @@ if %errorlevel% neq 0 ( echo Executing: set "PATH=%~dp0lib\PortableGit\bin;%PATH%" pause set "PATH=%~dp0lib\PortableGit\bin;%PATH%" - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Checking Git Installation... @@ -72,7 +74,7 @@ if %errorlevel% neq 0 ( echo Executing: git --version pause git --version - if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) ) echo -------------------------------------------------- @@ -81,7 +83,7 @@ echo -------------------------------------------------- echo Executing: git clone %REPO_URL% pause git clone %REPO_URL% -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @REM Pythonのセットアップ、仮想環境が有効化されて戻って来る echo -------------------------------------------------- @@ -90,7 +92,7 @@ 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% ) +if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @REM Style-Bert-VITS2フォルダに移動 pushd Style-Bert-VITS2 @@ -101,7 +103,7 @@ 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% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo -------------------------------------------------- echo Installing other dependencies... @@ -109,7 +111,7 @@ echo -------------------------------------------------- echo Executing: pip install -r requirements.txt pause pip install -r requirements.txt -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo ---------------------------------------- echo Environment setup is complete. Start downloading the model. diff --git a/scripts/Setup-Python.bat b/scripts/Setup-Python.bat index bdd4e1e..1c027d7 100644 --- a/scripts/Setup-Python.bat +++ b/scripts/Setup-Python.bat @@ -2,6 +2,9 @@ chcp 65001 > NUL @REM https://github.com/Zuntan03/EasyBertVits2 より引用・改変 +@REM エラーコードを遅延評価するために設定 +setlocal enabledelayedexpansion + @echo off set PS_CMD=PowerShell -Version 5.1 -ExecutionPolicy Bypass set CURL_CMD=C:\Windows\System32\curl.exe @@ -41,7 +44,7 @@ if not exist "%PYTHON_DIR%"\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Extracting zip... @@ -49,7 +52,7 @@ if not exist "%PYTHON_DIR%"\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Removing python.zip... @@ -57,7 +60,7 @@ if not exist "%PYTHON_DIR%"\ ( echo Executing: del python.zip pause del python.zip - if %errorlevel% neq 0 ( pause & exit /b %errorlevel% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Enabling 'site' module in the embedded Python environment... @@ -65,7 +68,7 @@ if not exist "%PYTHON_DIR%"\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Installing pip and virtualenv... @@ -73,7 +76,7 @@ if not exist "%PYTHON_DIR%"\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Installing pip... @@ -81,7 +84,7 @@ if not exist "%PYTHON_DIR%"\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Installing virtualenv... @@ -89,7 +92,7 @@ if not exist "%PYTHON_DIR%"\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) ) if not exist %VENV_DIR%\ ( @@ -99,7 +102,7 @@ if not exist %VENV_DIR%\ ( 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% ) + if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) ) echo -------------------------------------------------- @@ -108,7 +111,7 @@ echo -------------------------------------------------- echo Executing: call "%VENV_DIR%\Scripts\activate.bat" pause call "%VENV_DIR%\Scripts\activate.bat" -if %errorlevel% neq 0 ( pause & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Upgrading pip... @@ -116,7 +119,7 @@ echo -------------------------------------------------- echo Executing: python -m pip install --upgrade pip pause python -m pip install --upgrade pip -if %errorlevel% neq 0 ( pause & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & exit /b !errorlevel! ) echo -------------------------------------------------- echo Completed. diff --git a/scripts/Update-Style-Bert-VITS2.bat b/scripts/Update-Style-Bert-VITS2.bat index 31542cd..9226460 100644 --- a/scripts/Update-Style-Bert-VITS2.bat +++ b/scripts/Update-Style-Bert-VITS2.bat @@ -1,9 +1,11 @@ chcp 65001 > NUL @echo off +@REM エラーコードを遅延評価するために設定 +setlocal enabledelayedexpansion + pushd %~dp0 -set PATH=%~dp0lib\MinGit\cmd;%PATH% pushd Style-Bert-VITS2 @@ -11,7 +13,24 @@ echo -------------------------------------------------- echo Checking Git Installation... echo -------------------------------------------------- git --version -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( + echo -------------------------------------------------- + echo Global Git is not installed, so use PortableGit. + 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! ) + + echo -------------------------------------------------- + echo Checking Git Installation... + echo -------------------------------------------------- + echo Executing: git --version + pause + git --version + if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) +) pause @@ -19,7 +38,7 @@ echo -------------------------------------------------- echo Git pull... echo -------------------------------------------------- git pull -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @REM 仮想環境のpip requirements.txtを更新 @@ -29,10 +48,10 @@ echo -------------------------------------------------- @REM 仮想環境を有効化 call .\venv\Scripts\activate.bat -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) pip install -U -r requirements.txt -if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% ) +if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) echo ---------------------------------------- echo Update completed.