From a449a91f38b1aaf913ad499dde93980d40a031ce Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Fri, 1 Apr 2022 15:52:38 -0400
Subject: [PATCH] fix formatting

---
 setup/so-setup    | 42 +++++++++++++++++++++---------------------
 setup/so-whiptail |  1 -
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index af822c64c..9aaba8052 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -234,36 +234,36 @@ if ! [[ -f $install_opt_file ]]; then
 		echo "User cancelled setup." | tee -a "$setup_log"
 		whiptail_cancel
 	fi
-	if [[ $is_analyst ]]; then
-	    collect_hostname
-	    if [[ $is_analyst_iso ]]; then
-		    # Prompt Network Setup
-			whiptail_management_nic
-			whiptail_dhcp_or_static
+    if [[ $is_analyst ]]; then
+        collect_hostname
+        if [[ $is_analyst_iso ]]; then
+            # Prompt Network Setup
+            whiptail_management_nic
+            whiptail_dhcp_or_static
 
-			if [ "$address_type" != 'DHCP' ]; then
-				collect_int_ip_mask
-				collect_gateway
-				collect_dns
-				collect_dns_domain
-			fi
+            if [ "$address_type" != 'DHCP' ]; then
+                collect_int_ip_mask
+                collect_gateway
+                collect_dns
+                collect_dns_domain
+            fi
 		
-		fi
-	    if [[ ! $is_analyst_iso ]]; then
+        fi
+        if [[ ! $is_analyst_iso ]]; then
             # This should be a network install
-			whiptail_network_notice
-			whiptail_dhcp_warn
-			whiptail_management_nic
-		fi
+            whiptail_network_notice
+            whiptail_dhcp_warn
+            whiptail_management_nic
+        fi
 		whiptail_network_init_notice
 		network_init
 		printf '%s\n' \
-				"MNIC=$MNIC" \
-				"HOSTNAME=$HOSTNAME" > "$net_init_file"
+            "MNIC=$MNIC" \
+            "HOSTNAME=$HOSTNAME" > "$net_init_file"
 		set_main_ip >> $setup_log 2>&1
 		compare_main_nic_ip
 
-	fi
+    fi
 	    
 	if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then
 		whiptail_first_menu_iso
diff --git a/setup/so-whiptail b/setup/so-whiptail
index f028af323..5d98a5199 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -45,7 +45,6 @@ whiptail_analyst_install() {
 
 	NOTE: Selecting "no" will enable X Windows and set it to load at boot.
 	EOM
-    echo "whiptail"
 	whiptail --title "$whiptail_title" \
 		--yesno "$message" 11 75 --defaultno