From efce35d84f04a156219241feffc646a023e32c1a Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Tue, 10 Nov 2020 20:23:07 +0100
Subject: [PATCH] Rework gaming setup assistant

---
 usr/bin/setup-assistant | 58 ++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index d4f6210..a8203e1 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -83,47 +83,21 @@ elif [ $selection = "6" ]; then
     sudo systemctl enable --now snapd
     goto "start"
 elif [ $selection = "7" ]; then 
-    : game-selection
-    clear
-    echo "Which of these do you need?"
-    echo ""
-    echo "1) WINE! (running Windoze apps) 🍷"
-    echo "2) Game launchers (Lutris, Steam, etc..) ♟"
-    echo "3) Utilities (Fancontrol, Mangohud, Gamemode, ..) 🔧"
-    echo "4) Controller support 🎮"
-    echo "5) I dont care, just install everything! 🤪"
-    echo ""
-    echo "6) Go back"
-    read game
-    if [ $game = "1" ]; then
-        sudo pacman -S garuda-wine
-        goto "game-selection"
-    elif [ $game = "2" ]; then
-        sudo pacman -S ialauncher-git steam steam-native-runtime lutris gamehub itch minigalaxy legendary
-        goto "game-selection"
-    elif [ $game = "3" ]; then
-        sudo pacman -S openrgb-git piper fancontrol-gui-git corectrl gwe goverlay-git mangohud lib32-mangohud gamemode lib32-gamemode dxvk-mingw-git vkbasalt proton-tkg-git libretro vulkan-tools mesa-demos lib32-mesa-demos libdvdcss libva-utils vdpauinfo 
-        systemctl --user enable --now gamemoded  2>&1 & 
-        setup_dxvk install 2>&1 & 
-        goto "game-selection"
-    elif [ $game = "4" ]; then
-        sudo pacman -S antimicrox linuxconsole xboxdrv xpadneo-dkms-git steamos-xpad-dkms xow-git xbox-generic-controller game-devices-udev retroarch-autoconfig-udev-git
-        goto "game-selection"
-    elif [ $game = "5" ]; then
-        sudo pacman -S garuda-gamer
-    elif [ $game = "6" ]; then
+    : gaming
+    if pacman -Qs garuda-gamer > /dev/null ; then
+        echo "Now you can choose which components you need using the Garuda Gamer app. 🎮"
+        garuda-gamer >/dev/null 2>&1
         goto "start"
-    else echo "Thats not a valid choice! ❌"
-        goto "game-selection"
+    else sudo pacman -Syu garuda-gamer
+        goto "gaming"
     fi
-    goto "start"
 elif [ $selection = "8" ]; then 
     clear
-    sudo pacman -S --noconfirm --needed garuda-alsa garuda-pulse garuda-pipewire pulseaudio-ctl playerctl 
+    sudo pacman -Syu --noconfirm --needed garuda-alsa garuda-pulse garuda-pipewire pulseaudio-ctl playerctl 
     goto "start"
 elif [ $selection = "9" ]; then 
     clear
-    sudo pacman -S --noconfirm --needed garuda-settings-samba system-config-samba garuda-printer garuda-scanner
+    sudo pacman -Syu --noconfirm --needed garuda-settings-samba system-config-samba garuda-printer garuda-scanner
     goto "start"
 elif [ $selection = "10" ]; then 
     : office-selection
@@ -138,26 +112,26 @@ elif [ $selection = "10" ]; then
     echo "5) Yozo Office"
     read office
     if [ $office = "1" ]; then
-        sudo pacman -S libreoffice-fresh libmythes
+        sudo pacman -Syu libreoffice-fresh libmythes
         goto "start"
     elif [ $office = "2" ]; then
-        sudo pacman -S onlyoffice-bin
+        sudo pacman -Syu onlyoffice-bin
         goto "start"
     elif [ $office = "3" ]; then
-        sudo pacman -S wps-office wps-office-mime ttf-wps-fonts 
+        sudo pacman -Syu wps-office wps-office-mime ttf-wps-fonts 
         goto "start"
     elif [ $office = "4" ]; then
-        sudo pacman -S freeoffice
+        sudo pacman -Syu freeoffice
         goto "start"
     elif [ $office = "5" ]; then
-        sudo pacman -S yozo-office yozo-office-fonts
+        sudo pacman -Syu yozo-office yozo-office-fonts
         goto "start"
     else echo "Thats not a valid choice! ❌"
         goto "office-selection"
     fi
 elif [ $selection = "11" ]; then 
     clear
-    sudo pacman -S --noconfirm --needed telegram-desktop joplin murmur mumble discord streamlink-twitch-gui syncthing-gtk nextcloud-client firefox-extension-bitwarden fractal firefox-extension-xdm-browser-monitor
+    sudo pacman -Syu --noconfirm --needed telegram-desktop joplin murmur mumble discord streamlink-twitch-gui syncthing-gtk nextcloud-client firefox-extension-bitwarden fractal firefox-extension-xdm-browser-monitor
     goto "start"
 elif [ $selection = "12" ]; then
     : virt-selection
@@ -168,10 +142,10 @@ elif [ $selection = "12" ]; then
     echo "2) Id rather choose Virt-manager."
     read virt
     if [ $virt = "1" ]; then
-        sudo pacman -S garuda-virtualbox
+        sudo pacman -Syu garuda-virtualbox
         goto "start"
     elif [ $virt = "2" ]; then
-        sudo pacman -S garuda-virt-manager
+        sudo pacman -Syu garuda-virt-manager
         goto "start"
     else echo "Thats not a valid choice! ❌"
         goto "virt-selection"