1.0.1 HotFix

- [Programs Installer]: Fixed invalid inputs
TheRebuild · Mar 4, 2024 · 8eb2819 · 8eb2819
1 parent 58398f3
commit 8eb2819
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 98 deletions.
diff --git a/Programs/browsers.bat b/Programs/browsers.bat
@@ -23,41 +23,57 @@ echo ===================
 
 set /p choice="Enter your choice: "
 
-if "%choice%"=="1" (
-   winget install Google.Chrome --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+if %choice%==1 (
+   echo Installing, please wait...
+   winget install Google.Chrome --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
-) else if "%choice%"=="2" (
-   echo =================================================
-   echo 1. Mozilla Firefox ESR (Extended Support Release)
-   echo 2. Mozilla Firefox (Default)
-   echo =================================================
-   set /p choice="Enter your choice: "
-   if "%choice%"=="1" (
-      winget install Mozilla.Firefox.ESR --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
-      goto finish
-   ) else (
-      winget install Mozilla.Firefox --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
-      goto finish
-   )
-) else if "%choice%"=="3" (
-   winget install Microsoft.Edge --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+) 
+if %choice%==3 (
+   echo Installing, please wait...
+   winget install Microsoft.Edge --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
-) else if "%choice%"=="4" (
-   winget install Vivaldi.Vivaldi --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+) 
+if %choice%==4 (
+   echo Installing, please wait...
+   winget install Vivaldi.Vivaldi --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
-) else if "%choice%"=="5" (
-   winget install LibreWolf.LibreWolf --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+) 
+if %choice%==5 (
+   echo Installing, please wait...
+   winget install LibreWolf.LibreWolf --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
-) else if "%choice%"=="6" (
-   winget install Brave.Brave --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+) 
+if %choice%==6 (
+   echo Installing, please wait...
+   winget install Brave.Brave --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
-) else if "%choice%"=="7" (
-   winget install Waterfox.Waterfox --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+) 
+if %choice%==7 (
+   echo Installing, please wait...
+   winget install Waterfox.Waterfox --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
-) else if "%choice%"=="8" (
-   winget install Ablaze.Floorp --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+) 
+if %choice%==8 (
+   echo Installing, please wait...
+   winget install Ablaze.Floorp --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 )
+if %choice%==2 (
+   echo =================================================
+   echo 1. Mozilla Firefox ESR *Extended Support Release*
+   echo 2. Mozilla Firefox *Default*
+   echo =================================================
+   set /p browser_choice="Enter your choice: "
+   if "%browser_choice%"=="1" (
+      echo Installing, please wait...
+      winget install Mozilla.Firefox.ESR --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
+      goto finish
+   ) else if "%browser_choice%"=="2" (
+      echo Installing, please wait...
+      winget install Mozilla.Firefox --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
+      goto finish
+   )
+)
 
 :finish
 echo Done. Press any key to exit...

diff --git a/Programs/game_launcher.bat b/Programs/game_launcher.bat
@@ -19,13 +19,16 @@ echo ===================
 set /p choice="Enter your choice: "
 
 if "%choice%"=="1" (
-   winget install Valve.Steam --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+   echo Installing, please wait...
+   winget install Valve.Steam --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 ) else if "%choice%"=="2" (
-   winget install EpicGames.EpicGamesLauncher --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&
+   echo Installing, please wait...
+   winget install EpicGames.EpicGamesLauncher --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 ) else if "%choice%"=="3" (
-   winget install Ubisoft.Connect --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&
+   echo Installing, please wait...
+   winget install Ubisoft.Connect --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 ) 
 

diff --git a/Programs/media.bat b/Programs/media.bat
@@ -21,20 +21,25 @@ echo ========================================
 set /p choice="Enter your choice: "
 
 if "%choice%"=="1" (
-   winget install VideoLAN.VLC --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+   echo Installing, please wait...
+   winget install VideoLAN.VLC --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 ) else if "%choice%"=="2" (
-   winget install clsid2.mpc-hc --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+   echo Installing, please wait...
+   winget install clsid2.mpc-hc --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 ) else if "%choice%"=="3" (
-   winget install Spotify.Spotify --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+   echo Installing, please wait...
+   winget install Spotify.Spotify --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 ) else if "%choice%"=="4" (
-   winget install dotPDNLLC.paintdotnet --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+   echo Installing, please wait...
+   winget install dotPDNLLC.paintdotnet --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 )
 else if "%choice%"=="5" (
-   winget install PeterPawlowski.foobar2000 --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+   echo Installing, please wait...
+   winget install PeterPawlowski.foobar2000 --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
    goto finish
 )
 :finish

diff --git a/Programs/messengers.bat b/Programs/messengers.bat
@@ -21,23 +21,48 @@ echo ========================================
 
 set /p choice="Enter your choice: "
 
+if "%choice%"=="3" (
+   echo Installing, please wait...
+   winget install Viber.Viber --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
+   goto finish
+) 
+
+if "%choice%"=="4" (
+   echo Installing, please wait...
+   winget install WhatsApp.WhatsApp --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
+   goto finish
+) 
+
+if "%choice%"=="5" (
+   echo Installing, please wait...
+   winget install Zoom.Zoom --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
+   goto finish
+) 
+
+if "%choice%"=="6" (
+   echo Installing, please wait...
+   winget install Element.Element --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
+   goto finish
+)
+
 if "%choice%"=="1" (
-   echo ==============
-   echo 1. Telegram Desktop (Official)
+   echo ================================
+   echo 1. Telegram Desktop *Official*
    echo 2. 64Gram
-   echo ==============
+   echo ================================
    set /p choice="Enter your choice: "
 
    if "%choice%"=="1" (
-      winget install Telegram.TelegramDesktop --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&
+      winget install Telegram.TelegramDesktop --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    ) else if "%choice%"=="2" (
-      winget install 64gram.64gram --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+      winget install 64gram.64gram --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    )
-) else if "%choice%"=="2" (
+)
+if "%choice%"=="2" (
    echo ========================
-   echo 1. Discord (Official)
+   echo 1. Discord *Official*
    echo 2. Discord PTB
    echo 3. Discord Canary
    echo 4. Discord Development
@@ -46,34 +71,27 @@ if "%choice%"=="1" (
    set /p choice="Enter your choice: "
 
    if "%choice%"=="1" (
-      winget install Discord.Discord --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+      echo Installing, please wait...
+      winget install Discord.Discord --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    ) else if "%choice%"=="2" (
-      winget install Discord.Discord.PTB --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+      echo Installing, please wait...
+      winget install Discord.Discord.PTB --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    ) else if "%choice%"=="3" (
-      winget install Discord.Discord.Canary --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&
+      echo Installing, please wait...
+      winget install Discord.Discord.Canary --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    ) else if "%choice%"=="4" (
-      winget install Discord.Discord.Development --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&
+      echo Installing, please wait...
+      winget install Discord.Discord.Development --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    ) else if "%choice%"=="5" (
-      winget install Vencord.Vencord --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&
+      echo Installing, please wait...
+      winget install Vencord.Vencord --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
       goto finish
    )
-) else if "%choice%"=="3" (
-   winget install Viber.Viber --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
-   goto finish
-) else if "%choice%"=="4" (
-   winget install WhatsApp.WhatsApp --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
-   goto finish
-) else if "%choice%"=="5" (
-   winget install Zoom.Zoom --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
-   goto finish
-) else if "%choice%"=="6" (
-   winget install Element.Element --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
-   goto finish
-)
+) 
 
 :finish
 echo Done. Press any key to exit...

diff --git a/Programs/screenshoters.bat b/Programs/screenshoters.bat
@@ -19,13 +19,16 @@ echo ========================================
 set /p choice="Enter your choice: "
 
 if "%choice%"=="1" (
-    winget install ShareX.ShareX --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+    echo Installing, please wait...
+    winget install ShareX.ShareX --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
     goto finish
 ) else if "%choice%"=="2" (
-    winget install flameshot.Flameshot --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+    echo Installing, please wait...
+    winget install flameshot.Flameshot --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
     goto finish
 ) else if "%choice%"=="3" (
-    winget install Skillbrains.Lightshot --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force >NUL 2>&1
+    echo Installing, please wait...
+    winget install Skillbrains.Lightshot --silent --ignore-security-hash --accept-package-agreements --accept-source-agreements --force
     goto finish
 )