From 8882c23b185e3ae1bb7c5edad873839d278399a6 Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:30:29 -0700
Subject: [PATCH] etcupdate: code optimize (usage if no RELEASE)

---
 usr/local/share/bastille/etcupdate.sh | 55 ++++++++++++++-------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/usr/local/share/bastille/etcupdate.sh b/usr/local/share/bastille/etcupdate.sh
index 1f143c29..d689f323 100644
--- a/usr/local/share/bastille/etcupdate.sh
+++ b/usr/local/share/bastille/etcupdate.sh
@@ -111,10 +111,6 @@ update_jail_etc() {
     fi
 }
 
-if [ "$#" -lt 2 ] || [ "$#" -gt 4 ]; then
-    usage
-fi
-
 # Handle options.
 DRY_RUN=0
 FORCE=0
@@ -152,6 +148,10 @@ while [ "$#" -gt 0 ]; do
     esac
 done
 
+if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then
+    usage
+fi
+
 # Main commands
 while [ "$#" -gt 0 ]; do
     case "${1}" in
@@ -166,31 +166,32 @@ while [ "$#" -gt 0 ]; do
             fi
             ;;
         *)
-            if [ -z "${2}" ]; then
-                usage
-            else
-                TARGET="${1}"
-                ACTION="${2}"
-                RELEASE="${3}"
-                set_target_single "${TARGET}"
-                case "${ACTION}" in
-                    diff)
-                        diff_review "${TARGET}"
-                        shift "$#"
-                        ;;
-                    resolve)
-                        resolve_conflicts "${TARGET}"
-                        shift "$#"
-                        ;;
-                    update)
+            TARGET="${1}"
+            ACTION="${2}"
+            RELEASE="${3}"
+            set_target_single "${TARGET}"
+            case "${ACTION}" in
+                diff)
+                    diff_review "${TARGET}"
+                    shift "$#"
+                    ;;
+                resolve)
+                    resolve_conflicts "${TARGET}"
+                    shift "$#"
+                    ;;
+                update)
+                    if [ -z "${RELEASE}" ]; then
+                        usage
+                    else
                         update_jail_etc "${TARGET}" "${RELEASE}"
                         shift "$#"
-                        ;;
-                    *)
-                    error_exit "Unknown action: \"${ACTION}\""
+                    fi
                     ;;
-                esac
-            fi
-            ;;
+                *)
+                error_exit "Unknown action: \"${ACTION}\""
+                ;;
+            esac
+        fi
+        ;;
     esac
 done