From 25cde6153ca169c5bd5c564bdb193a54a9d35fb4 Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Fri, 16 May 2025 18:41:44 -0600
Subject: [PATCH] setup: Options are first

---
 usr/local/share/bastille/setup.sh | 67 ++++++++++++++++---------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/usr/local/share/bastille/setup.sh b/usr/local/share/bastille/setup.sh
index b0b273a9..90deaaef 100644
--- a/usr/local/share/bastille/setup.sh
+++ b/usr/local/share/bastille/setup.sh
@@ -51,11 +51,46 @@ EOF
     exit 1
 }
 
+# Handle options.
+AUTO_YES=0
+while [ "$#" -gt 0 ]; do
+    case "${1}" in
+        -h|--help|help)
+            usage
+            ;;
+        -y|--yes)
+            AUTO_YES=1
+            shift
+            ;;
+        -x|--debug)
+            enable_debug
+            shift
+            ;;
+        -*) 
+            for _opt in $(echo ${1} | sed 's/-//g' | fold -w1); do
+                case ${_opt} in
+                    y) AUTO_YES=1 ;;
+                    x) enable_debug ;;
+                    *) error_exit "[ERROR]: Unknown Option: \"${1}\"" ;;
+                esac
+            done
+            shift
+            ;;
+        *)
+            break
+            ;;
+    esac
+done
+
 # Check for too many args
 if [ "$#" -gt 1 ]; then
     usage
 fi
 
+OPT_CONFIG="${1}"
+
+bastille_root_check
+
 configure_filesystem() {
 
     # This is so we dont have to introduce breaking
@@ -356,38 +391,6 @@ if [ $# -eq 0 ]; then
     exit 0
 fi
 
-# Handle options.
-AUTO_YES=0
-while [ "$#" -gt 0 ]; do
-    case "${1}" in
-        -h|--help|help)
-            usage
-            ;;
-        -y|--yes)
-            AUTO_YES=1
-            shift
-            ;;
-        -x|--debug)
-            enable_debug
-            shift
-            ;;
-        -*) 
-            for _opt in $(echo ${1} | sed 's/-//g' | fold -w1); do
-                case ${_opt} in
-                    y) AUTO_YES=1 ;;
-                    x) enable_debug ;;
-                    *) error_exit "[ERROR]: Unknown Option: \"${1}\"" ;;
-                esac
-            done
-            shift
-            ;;
-        *)
-            break
-            ;;
-    esac
-done
-
-# Handle options.
 case "${1}" in
     filesystem)
         configure_filesystem