From 242e7ee2f0c3b5ce462df4c717ce60d609b060ea Mon Sep 17 00:00:00 2001 From: litagin02 Date: Sat, 16 Mar 2024 17:26:05 +0900 Subject: [PATCH] Fix activating venv --- scripts/Install-Style-Bert-VITS2-CPU.bat | 8 ++++++++ scripts/Install-Style-Bert-VITS2.bat | 10 +++++++++- scripts/Setup-Python.bat | 2 +- scripts/Update-Style-Bert-VITS2.bat | 12 ++++++++---- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/scripts/Install-Style-Bert-VITS2-CPU.bat b/scripts/Install-Style-Bert-VITS2-CPU.bat index a4a26b3..9fd6008 100644 --- a/scripts/Install-Style-Bert-VITS2-CPU.bat +++ b/scripts/Install-Style-Bert-VITS2-CPU.bat @@ -97,6 +97,14 @@ if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @REM Style-Bert-VITS2フォルダに移動 pushd Style-Bert-VITS2 +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! ) + echo -------------------------------------------------- echo Installing dependencies... echo -------------------------------------------------- diff --git a/scripts/Install-Style-Bert-VITS2.bat b/scripts/Install-Style-Bert-VITS2.bat index 1daa00e..6868863 100644 --- a/scripts/Install-Style-Bert-VITS2.bat +++ b/scripts/Install-Style-Bert-VITS2.bat @@ -85,7 +85,7 @@ pause git clone %REPO_URL% if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) -@REM Pythonのセットアップ、仮想環境が有効化されて戻って来る +@REM Pythonのセットアップ echo -------------------------------------------------- echo Setting up Python environment... echo -------------------------------------------------- @@ -97,6 +97,14 @@ if !errorlevel! neq 0 ( popd & exit /b !errorlevel! ) @REM Style-Bert-VITS2フォルダに移動 pushd Style-Bert-VITS2 +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! ) + echo -------------------------------------------------- echo Installing PyTorch... echo -------------------------------------------------- diff --git a/scripts/Setup-Python.bat b/scripts/Setup-Python.bat index 1c027d7..4c30ce7 100644 --- a/scripts/Setup-Python.bat +++ b/scripts/Setup-Python.bat @@ -106,7 +106,7 @@ if not exist %VENV_DIR%\ ( ) echo -------------------------------------------------- -echo Actibating virtual environment... +echo Activating virtual environment... echo -------------------------------------------------- echo Executing: call "%VENV_DIR%\Scripts\activate.bat" pause diff --git a/scripts/Update-Style-Bert-VITS2.bat b/scripts/Update-Style-Bert-VITS2.bat index 9226460..271fc17 100644 --- a/scripts/Update-Style-Bert-VITS2.bat +++ b/scripts/Update-Style-Bert-VITS2.bat @@ -43,13 +43,17 @@ if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) @REM 仮想環境のpip requirements.txtを更新 echo -------------------------------------------------- -echo Updating dependencies... +echo Activating virtual environment... echo -------------------------------------------------- - -@REM 仮想環境を有効化 -call .\venv\Scripts\activate.bat +echo Executing: call ".\venv\Scripts\activate.bat" +pause +call ".\venv\Scripts\activate.bat" if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! ) +echo -------------------------------------------------- +echo Updating dependencies... +echo -------------------------------------------------- +echo Executing: pip install -U -r requirements.txt pip install -U -r requirements.txt if !errorlevel! neq 0 ( pause & popd & exit /b !errorlevel! )