launcher upgrades

+changed variables app installer

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

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...

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...

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

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
 

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

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

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