From 3df39078bfa790f316e5d3d9844724b6ce9672b6 Mon Sep 17 00:00:00 2001
From: Christer Edwards <cedwards@users.noreply.github.com>
Date: Fri, 24 Nov 2023 16:28:31 -0700
Subject: [PATCH 1/2] support combining options for bastille create

---
 usr/local/share/bastille/create.sh | 57 ++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index 5798e640..d232d5c9 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -607,36 +607,79 @@ LINUX_JAIL=""
 # Handle and parse options
 while [ $# -gt 0 ]; do
     case "${1}" in
-        -E|--empty|empty)
+        -E|--empty)
             EMPTY_JAIL="1"
             shift
             ;;
-        -L|--linux|linux)
+        -L|--linux)
             LINUX_JAIL="1"
             shift
             ;;
-        -T|--thick|thick)
+        -T|--thick)
             THICK_JAIL="1"
             shift
             ;;
-        -V|--vnet|vnet)
+        -V|--vnet)
             VNET_JAIL="1"
             shift
             ;;
-        -B|--bridge|bridge)
+        -B|--bridge)
             VNET_JAIL="1"
             VNET_JAIL_BRIDGE="1"
             shift
             ;;
-        -C|--clone|clone)
+        -C|--clone)
             CLONE_JAIL="1"
             shift
             ;;
+        -CV|-VC|--clone-vnet)
+            VNET_JAIL="1"
+            CLONE_JAIL="1"
+            shift
+            ;;
+        -CB|-BC|--clone-bridge)
+            VNET_JAIL="1"
+            VNET_JAIL_BRIDGE="1"
+            CLONE_JAIL="1"
+            shift
+            ;;
+        -TV|-VT|--thick-vnet)
+            VNET_JAIL="1"
+            THICK_JAIL="1"
+            shift
+            ;;
+        -TB|-BT|--thick-bridge)
+            VNET_JAIL="1"
+            VNET_JAIL_BRIDGE="1"
+            THICK_JAIL="1"
+            shift
+            ;;
+        -EB|-BE|--empty-bridge)
+            VNET_JAIL="1"
+            CLONE_JAIL="1"
+            shift
+            ;;
+        -EV|-VE|--empty-vnet)
+            VNET_JAIL="1"
+            EMPTY_JAIL="1"
+            shift
+            ;;
+        -LV|-VL|--linux-vnet)
+            VNET_JAIL="1"
+            LINUX_JAIL="1"
+            shift
+            ;;
+        -LB|-BL|--linux-bridge)
+            VNET_JAIL="1"
+            VNET_JAIL_BRIDGE="1"
+            LINUX_JAIL="1"
+            shift
+            ;;
         -*|--*)
             error_notify "Unknown Option."
             usage
             ;;
-       *)
+        *)
             break
             ;;
     esac

From 97a0e692d90f7be32a133cfd0a54aa67d4a45f33 Mon Sep 17 00:00:00 2001
From: Christer Edwards <cedwards@users.noreply.github.com>
Date: Fri, 24 Nov 2023 16:41:25 -0700
Subject: [PATCH 2/2] standardize options in create matrix

---
 usr/local/share/bastille/create.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index d232d5c9..2507d528 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -633,46 +633,47 @@ while [ $# -gt 0 ]; do
             shift
             ;;
         -CV|-VC|--clone-vnet)
-            VNET_JAIL="1"
             CLONE_JAIL="1"
+            VNET_JAIL="1"
             shift
             ;;
         -CB|-BC|--clone-bridge)
+            CLONE_JAIL="1"
             VNET_JAIL="1"
             VNET_JAIL_BRIDGE="1"
-            CLONE_JAIL="1"
             shift
             ;;
         -TV|-VT|--thick-vnet)
-            VNET_JAIL="1"
             THICK_JAIL="1"
+            VNET_JAIL="1"
             shift
             ;;
         -TB|-BT|--thick-bridge)
+            THICK_JAIL="1"
             VNET_JAIL="1"
             VNET_JAIL_BRIDGE="1"
-            THICK_JAIL="1"
             shift
             ;;
         -EB|-BE|--empty-bridge)
+            EMPTY_JAIL="1"
             VNET_JAIL="1"
-            CLONE_JAIL="1"
+            VNET_JAIL_BRIDGE="1"
             shift
             ;;
         -EV|-VE|--empty-vnet)
-            VNET_JAIL="1"
             EMPTY_JAIL="1"
+            VNET_JAIL="1"
             shift
             ;;
         -LV|-VL|--linux-vnet)
-            VNET_JAIL="1"
             LINUX_JAIL="1"
+            VNET_JAIL="1"
             shift
             ;;
         -LB|-BL|--linux-bridge)
+            LINUX_JAIL="1"
             VNET_JAIL="1"
             VNET_JAIL_BRIDGE="1"
-            LINUX_JAIL="1"
             shift
             ;;
         -*|--*)