From 9e3ad27ecf110d995ad186f23b4b40dcd38b0f42 Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Wed, 7 Jul 2021 05:22:35 -0400
Subject: [PATCH] Re-added new and improved create.sh file

---
 usr/local/share/bastille/create.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index e46109e0..2f56c092 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -438,32 +438,36 @@ EMPTY_JAIL=""
 THICK_JAIL=""
 VNET_JAIL=""
 
-## handle combined options then shift
-if [ "${1}" = "-T" -o "${1}" = "--thick" -o "${1}" = "thick" ] && \
-    [ "${2}" = "-V" -o "${2}" = "--vnet" -o "${2}" = "vnet" ]; then
-    THICK_JAIL="1"
-    VNET_JAIL="1"
-    shift 2
-else
-    ## handle single options
+# Handle and parse options
+while [ $# -gt 0 ]; do
     case "${1}" in
         -E|--empty|empty)
-            shift
             EMPTY_JAIL="1"
+            shift
             ;;
         -T|--thick|thick)
-            shift
             THICK_JAIL="1"
+            shift
             ;;
         -V|--vnet|vnet)
-            shift
             VNET_JAIL="1"
+            shift
             ;;
-        -*)
+        -*|--*)
             error_notify "Unknown Option."
             usage
             ;;
+       *)
+            break
+            ;;
     esac
+done
+
+## validate for combined options
+if [ -n "${EMPTY_JAIL}" ]; then 
+    if [ -n "${THICK_JAIL}" ] || [ -n "${VNET_JAIL}" ]; then
+        error_exit "Error: Empty jail option can't be used with other options."
+    fi
 fi
 
 NAME="$1"