From 79c28a1c2ff757bc38ea05376fe13bec33e9d0aa Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Wed, 11 Nov 2020 21:21:27 +0100
Subject: [PATCH] Add no choices to setup-assistant

---
 usr/bin/setup-assistant | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index 013815d..73fa7c7 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -80,8 +80,8 @@ function upgrade2ultimate
         garuda-scanner" >> /tmp/setup-assistant/pkgs.txt
     fi
 
-    clear
     : office-selection
+    clear
     echo "Now you are free to choose your favorite office suite."
     echo "There are quite a lot of them to choose from. A guideline for new users:"
     echo "LibreOffice is the most used and complete office application in the Linux world."
@@ -94,7 +94,8 @@ function upgrade2ultimate
     echo "5) Yozo Office"
     echo "6) Calligra Office"
     echo "7) Abiword"
-    echo "8) Who needs office anyway?"
+    echo ""
+    echo "Who needs office anyway? (n)"
     read office
     if [ $office = "1" ]; then
         echo "libreoffice-fresh
@@ -114,7 +115,7 @@ function upgrade2ultimate
         echo "calligra" >> /tmp/setup-assistant/pkgs.txt
     elif [ $office = "7" ]; then
         echo "abiword" >> /tmp/setup-assistant/pkgs.txt
-    elif [ $office = "7" ]; then
+    elif [ $office = "n" ]; then
         echo "nooffice" >/dev/null 2>&1 &
     else echo "Thats not a valid choice! ❌"
         goto "office-selection"
@@ -145,6 +146,8 @@ function upgrade2ultimate
     echo ""
     echo "1) Virtualbox all the way!"
     echo "2) Id rather choose Virt-manager."
+    echo ""
+    echo "I dont need virtualisation software! (n)"
     read virt
     if [ $virt = "1" ]; then
         echo "garuda-virtualbox" >> /tmp/setup-assistant/pkgs.txt
@@ -154,6 +157,8 @@ function upgrade2ultimate
         echo "sudo systemctl enable --now libvirtd" >> /tmp/setup-assistant/setup.sh
         echo "sudo usermod -aG libvirt $USER" >> /tmp/setup-assistant/setup.sh
         echo "sudo usermod -aG kvm $USER" >> /tmp/setup-assistant/setup.sh
+    elif [ $virt = "n" ]; then
+        echo "novirt" >/dev/null 2>&1 &
     else echo "Thats not a valid choice! ❌"
         goto "virt-selection"
     fi