From 7d95bc15a75caad045b94788917fa9bff5e024fb Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Tue, 27 Oct 2020 12:27:01 +0100
Subject: [PATCH] Move setup assistant & related to /usr/bin

---
 etc/skel/.config/autostart-scripts/setup.sh            |  7 ++++---
 .../setup-assistant.sh => usr/bin/setup-assistant      | 10 ++++------
 .../upgrade-to-ultimate.sh => usr/bin/upgrade2ultimate |  0
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename etc/skel/.config/autostart-scripts/setup-assistant.sh => usr/bin/setup-assistant (91%)
 rename etc/skel/.config/autostart-scripts/upgrade-to-ultimate.sh => usr/bin/upgrade2ultimate (100%)

diff --git a/etc/skel/.config/autostart-scripts/setup.sh b/etc/skel/.config/autostart-scripts/setup.sh
index 4b8b7cd..d4e2bff 100755
--- a/etc/skel/.config/autostart-scripts/setup.sh
+++ b/etc/skel/.config/autostart-scripts/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
 systemctl --user enable gamemoded &
 systemctl --user start gamemoded &
 
@@ -14,12 +14,13 @@ systemctl --user start psd &
 libinput-gestures-setup autostart &
 libinput-gestures-setup start &
 
+setup_dxvk install &
 
-alacritty -e "${HOME}/.config/autostart-scripts/setup-assistant.sh"
+alacritty -e "setup-assistant"
 
 rm -rf "${HOME}/.config/autostart-scripts/setup.sh" &
 
 notify-send "Setup complete!"
 
-setup_dxvk install &
+
 exit
diff --git a/etc/skel/.config/autostart-scripts/setup-assistant.sh b/usr/bin/setup-assistant
similarity index 91%
rename from etc/skel/.config/autostart-scripts/setup-assistant.sh
rename to usr/bin/setup-assistant
index b31261f..c7b67ce 100755
--- a/etc/skel/.config/autostart-scripts/setup-assistant.sh
+++ b/usr/bin/setup-assistant
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
 function goto
 {
     label=$1
@@ -28,7 +28,7 @@ echo "7) Enable Snap & Flatpak support"
 echo "8) Install gaming dependencies, Lutris & Steam"
 echo "9) Upgrade to Ultimate (excluding desktop-specific apps)"
 echo ""
-echo "10) Exit & delete this assistant"
+echo "10) Exit"
 echo ""
 
 read selection
@@ -87,16 +87,14 @@ elif [ $selection = "8" ]; then
     sudo pacman -Syu --noconfirm gamemode lib32-gamemode lutris garuda-wine steam steam-native-runtime mangohud lib32-mangohud proton-tkg-git dxvk-mingw-git
     systemctl --user enable --now gamemoded
     echo ""
-    echo "All gaming should now be installed. 🕹"
+    echo "All gaming apps should now be installed. 🕹"
     goto "start"
 elif [ $selection = "9" ]; then 
     echo ""
-    sudo sh ~/.config/autostart-scripts/upgrade-to-ultimate.sh
+    sudo upgrade2ultimate
     echo ""
     goto "start"
 elif [ $selection = "10" ]; then 
-    rm -r ~/.config/autostart-scripts/setup-assistant.sh
-    echo "Script deleted."
     exit
 else echo "Thats not a valid choice! ❌"
     goto "start"
diff --git a/etc/skel/.config/autostart-scripts/upgrade-to-ultimate.sh b/usr/bin/upgrade2ultimate
similarity index 100%
rename from etc/skel/.config/autostart-scripts/upgrade-to-ultimate.sh
rename to usr/bin/upgrade2ultimate