From bff554d79cd9a8cf6bc8a60f0a04264b59ef60c2 Mon Sep 17 00:00:00 2001 From: deffcolony <61471128+deffcolony@users.noreply.github.com> Date: Mon, 8 Jul 2024 20:07:57 +0200 Subject: [PATCH] launcher upgrades +changed variables app installer --- .../Image_Generation/install_fooocus.bat | 1 + .../Image_Generation/install_sdwebui.bat | 2 +- .../Image_Generation/install_sdwebuiforge.bat | 2 +- .../Text_Completion/install_koboldcpp_raw.bat | 52 +++++++++---------- .../Text_Completion/install_llamacpp.bat | 10 ++-- .../Voice_Generation/install_alltalk.bat | 6 +-- .../Voice_Generation/install_rvc.bat | 6 +-- .../Voice_Generation/install_xtts.bat | 11 ++-- 8 files changed, 43 insertions(+), 47 deletions(-) diff --git a/bin/functions/Toolbox/App_Installer/Image_Generation/install_fooocus.bat b/bin/functions/Toolbox/App_Installer/Image_Generation/install_fooocus.bat index 3ff58b8..3c4a8f1 100644 --- a/bin/functions/Toolbox/App_Installer/Image_Generation/install_fooocus.bat +++ b/bin/functions/Toolbox/App_Installer/Image_Generation/install_fooocus.bat @@ -16,6 +16,7 @@ if not exist "%image_generation_dir%" ( ) cd /d "%image_generation_dir%" + set max_retries=3 set retry_count=0 :retry_install_fooocus diff --git a/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebui.bat b/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebui.bat index 58f3ae0..9061e49 100644 --- a/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebui.bat +++ b/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebui.bat @@ -31,7 +31,7 @@ if %errorlevel% neq 0 ( pause goto :app_installer_image_generation ) -cd /d "stable-diffusion-webui" +cd /d "%sdwebui_install_path%" REM Run conda activate from the Miniconda installation echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Activating Miniconda environment... diff --git a/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebuiforge.bat b/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebuiforge.bat index 3bf97d7..ec3e660 100644 --- a/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebuiforge.bat +++ b/bin/functions/Toolbox/App_Installer/Image_Generation/install_sdwebuiforge.bat @@ -31,7 +31,7 @@ if %errorlevel% neq 0 ( pause goto :app_installer_image_generation ) -cd /d "stable-diffusion-webui-forge" +cd /d "%sdwebuiforge_install_path%" REM Run conda activate from the Miniconda installation echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Activating Miniconda environment... diff --git a/bin/functions/Toolbox/App_Installer/Text_Completion/install_koboldcpp_raw.bat b/bin/functions/Toolbox/App_Installer/Text_Completion/install_koboldcpp_raw.bat index 91050ad..20907db 100644 --- a/bin/functions/Toolbox/App_Installer/Text_Completion/install_koboldcpp_raw.bat +++ b/bin/functions/Toolbox/App_Installer/Text_Completion/install_koboldcpp_raw.bat @@ -15,6 +15,31 @@ if not exist "%w64devkit_install_path%" ( goto :app_installer_core_utilities ) +REM Check if the folder exists +if not exist "%text_completion_dir%" ( + mkdir "%text_completion_dir%" + echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "text-completion" +) else ( + echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "text-completion" folder already exists.%reset% +) + +REM Check if the folder exists +if not exist "%koboldcpp_install_path%" ( + mkdir "%koboldcpp_install_path%" + echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "dev-koboldcpp" +) else ( + echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "dev-koboldcpp" folder already exists.%reset% +) +cd /d "%koboldcpp_install_path%" + +REM Check if file exists +if not exist "make.sh" ( + echo make -C "${1}" > "make.sh" + echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created new file: "make.sh" +) else ( + echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "make.sh" already exists.%reset% +) + REM Activate the Miniconda installation echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Activating Miniconda environment... call "%miniconda_path%\Scripts\activate.bat" @@ -32,33 +57,6 @@ echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing pip requi pip install pyinstaller echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing koboldcpp... -cd /d "%~dp0" - -REM Check if the folder exists -if not exist "%~dp0text-completion" ( - mkdir "%~dp0text-completion" - echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "text-completion" -) else ( - echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "text-completion" folder already exists.%reset% -) - - -REM Check if the folder exists -if not exist "%koboldcpp_install_path%" ( - mkdir "%koboldcpp_install_path%" - echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "dev-koboldcpp" -) else ( - echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "dev-koboldcpp" folder already exists.%reset% -) -cd /d "%koboldcpp_install_path%" - -REM Check if file exists -if not exist "make.sh" ( - echo make -C "${1}" > "make.sh" - echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created new file: "make.sh" -) else ( - echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "make.sh" already exists.%reset% -) set max_retries=3 set retry_count=0 diff --git a/bin/functions/Toolbox/App_Installer/Text_Completion/install_llamacpp.bat b/bin/functions/Toolbox/App_Installer/Text_Completion/install_llamacpp.bat index 9ecae27..63e60c2 100644 --- a/bin/functions/Toolbox/App_Installer/Text_Completion/install_llamacpp.bat +++ b/bin/functions/Toolbox/App_Installer/Text_Completion/install_llamacpp.bat @@ -15,18 +15,14 @@ if not exist "%w64devkit_install_path%" ( goto :app_installer_core_utilities ) -echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing llamacpp... -cd /d "%~dp0" - REM Check if the folder exists -if not exist "%~dp0text-completion" ( - mkdir "%~dp0text-completion" +if not exist "%text_completion_dir%" ( + mkdir "%text_completion_dir%" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "text-completion" ) else ( echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "text-completion" folder already exists.%reset% ) - REM Check if the folder exists if not exist "%llamacpp_install_path%" ( mkdir "%llamacpp_install_path%" @@ -36,6 +32,8 @@ if not exist "%llamacpp_install_path%" ( ) cd /d "%llamacpp_install_path%" +echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing llamacpp... + set max_retries=3 set retry_count=0 diff --git a/bin/functions/Toolbox/App_Installer/Voice_Generation/install_alltalk.bat b/bin/functions/Toolbox/App_Installer/Voice_Generation/install_alltalk.bat index 44901dc..ad816a6 100644 --- a/bin/functions/Toolbox/App_Installer/Voice_Generation/install_alltalk.bat +++ b/bin/functions/Toolbox/App_Installer/Voice_Generation/install_alltalk.bat @@ -51,13 +51,13 @@ if "%gpu_choice%"=="1" ( echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing AllTalk... REM Check if the folder exists -if not exist "%~dp0voice-generation" ( - mkdir "%~dp0voice-generation" +if not exist "%voice_generation_dir%" ( + mkdir "%voice_generation_dir%" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "voice-generation" ) else ( echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "voice-generation" folder already exists.%reset% ) -cd /d "%~dp0voice-generation" +cd /d "%voice_generation_dir%" set max_retries=3 set retry_count=0 diff --git a/bin/functions/Toolbox/App_Installer/Voice_Generation/install_rvc.bat b/bin/functions/Toolbox/App_Installer/Voice_Generation/install_rvc.bat index 265ac46..159e1ec 100644 --- a/bin/functions/Toolbox/App_Installer/Voice_Generation/install_rvc.bat +++ b/bin/functions/Toolbox/App_Installer/Voice_Generation/install_rvc.bat @@ -59,13 +59,13 @@ if "%gpu_choice%"=="1" ( echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing RVC... REM Check if the folder exists -if not exist "%~dp0voice-generation" ( - mkdir "%~dp0voice-generation" +if not exist "%voice_generation_dir%" ( + mkdir "%voice_generation_dir%" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "voice-generation" ) else ( echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "voice-generation" folder already exists.%reset% ) -cd /d "%~dp0voice-generation" +cd /d "%voice_generation_dir%" set max_retries=3 set retry_count=0 diff --git a/bin/functions/Toolbox/App_Installer/Voice_Generation/install_xtts.bat b/bin/functions/Toolbox/App_Installer/Voice_Generation/install_xtts.bat index 6231cd7..b02f315 100644 --- a/bin/functions/Toolbox/App_Installer/Voice_Generation/install_xtts.bat +++ b/bin/functions/Toolbox/App_Installer/Voice_Generation/install_xtts.bat @@ -53,13 +53,13 @@ if "%gpu_choice%"=="1" ( ) :install_xtts_pre REM Check if the folder exists -if not exist "%~dp0voice-generation" ( - mkdir "%~dp0voice-generation" +if not exist "%voice_generation_dir%" ( + mkdir "%voice_generation_dir%" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Created folder: "voice-generation" ) else ( echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO] "voice-generation" folder already exists.%reset% ) -cd /d "%~dp0voice-generation" +cd /d "%voice_generation_dir%" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing XTTS... @@ -113,11 +113,10 @@ mkdir "%xtts_install_path%\speakers" mkdir "%xtts_install_path%\output" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Adding voice examples to speakers directory... -xcopy "%~dp0voice-generation\xtts-api-server\example\*" "%xtts_install_path%\speakers\" /y /e +xcopy "%voice_generation_dir%\xtts-api-server\example\*" "%xtts_install_path%\speakers\" /y /e echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Removing the xtts-api-server directory... -cd /d "%~dp0" -rmdir /s /q "%~dp0voice-generation\xtts-api-server" +rmdir /s /q "%voice_generation_dir%\xtts-api-server" echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%XTTS installed successfully%reset% pause