From 0a9a652d3b595663ef8196c9d0718e6ce26cd3dc Mon Sep 17 00:00:00 2001
From: litagin02 <litagin02@gmail.com>
Date: Wed, 27 Dec 2023 10:58:30 +0900
Subject: [PATCH] Fix bat scripts

---
 scripts/Install-Style-Bert-VITS2.bat | 19 ++++++++---
 scripts/Setup.bat                    | 48 ----------------------------
 2 files changed, 15 insertions(+), 52 deletions(-)
 delete mode 100644 scripts/Setup.bat

diff --git a/scripts/Install-Style-Bert-VITS2.bat b/scripts/Install-Style-Bert-VITS2.bat
index bfeb09d..131d2ea 100644
--- a/scripts/Install-Style-Bert-VITS2.bat
+++ b/scripts/Install-Style-Bert-VITS2.bat
@@ -15,18 +15,29 @@ if not exist %CURL_CMD% (
 if not exist lib\ ( mkdir lib )
 
 %CURL_CMD% -Lo Style-Bert-VITS2.zip^
-	https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/main.zip
+	https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/master.zip
 if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
 
 %PS_CMD% Expand-Archive -Path Style-Bert-VITS2.zip -DestinationPath . -Force
 if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
 
-del lib\Style-Bert-VITS2.zip
+del Style-Bert-VITS2.zip
 if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
 
-xcopy /QSY .\lib\%STYLE_BERT_VITS2_DIR%\scripts .
+ren Style-Bert-VITS2-master Style-Bert-VITS2
 
-call src\Setup.bat
+call Style-Bert-VITS2\scripts\Setup-Python.bat ..\..\lib\python ..\venv
+if %errorlevel% neq 0 ( popd & exit /b %errorlevel% )
+
+pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
+if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
+
+pip install -r Style-Bert-VITS2\requirements.txt
+if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
+
+pushd Style-Bert-VITS2
+python initialize.py
+popd
 
 popd
 
diff --git a/scripts/Setup.bat b/scripts/Setup.bat
deleted file mode 100644
index 5a3c1d3..0000000
--- a/scripts/Setup.bat
+++ /dev/null
@@ -1,48 +0,0 @@
-chcp 65001 > NUL
-
-@REM https://github.com/Zuntan03/EasyBertVits2 より引用・改変
-
-@echo off
-pushd %~dp0..
-set PS_CMD=PowerShell -Version 5.1 -ExecutionPolicy Bypass
-
-set CURL_CMD=C:\Windows\System32\curl.exe
-if not exist %CURL_CMD% (
-	echo [ERROR] %CURL_CMD% が見つかりません。
-	pause & popd & exit /b 1
-)
-
-echo 以下の配布元から関連ファイルをダウンロードして使用します（URL を Ctrl + クリックで開けます）。
-echo https://www.python.org/
-echo https://github.com/pypa/get-pip
-echo https://github.com/litagin02/Style-Bert-VITS2/
-echo よろしいですか？ [y/n]
-set /p YES_OR_NO=
-if /i not "%YES_OR_NO%" == "y" ( popd & exit /b 1 )
-
-if not exist lib\ ( mkdir lib )
-
-if not exist Style-Bert-VITS2\ (
-	%CURL_CMD% -Lo Style-Bert-VITS2.zip https://github.com/litagin02/Style-Bert-VITS2/archive/refs/heads/master.zip
-	if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
-
-	%PS_CMD% Expand-Archive -Path Style-Bert-VITS2.zip -DestinationPath . -Force
-	if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
-
-	del Style-Bert-VITS2.zip
-	if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
-)
-
-call %~dp0Setup-Python.bat ..\lib\python ..\Bert-VITS2\venv
-if %errorlevel% neq 0 ( popd & exit /b %errorlevel% )
-
-pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
-if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
-
-pip install -r Bert-VITS2\requirements.txt
-if %errorlevel% neq 0 ( pause & popd & exit /b %errorlevel% )
-
-pushd Bert-VITS2
-python initialize.py
-
-popd