From 1ec45fb4ae978e3a47a3e3df43c0abb0715a501a Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 7 Jan 2021 10:37:25 -0500
Subject: [PATCH] [fix] Only show Zeek prompts if Zeek was selected as the MD
 tool

Resolves #900
---
 setup/so-setup | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index a436c25c1..1a8a5d223 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -392,10 +392,11 @@ if [[ $is_manager && ! $is_eval ]]; then
 	  	whiptail_manager_adv_escluster
 	  fi
 	fi
+	
 	whiptail_metadata_tool
-	if [ "$MANAGERADV" = 'ADVANCED' ] && [ "$ZEEKVERSION" != 'SURICATA' ]; then
-		whiptail_manager_adv_service_zeeklogs
-	fi
+	
+	[[ $MANAGERADV == "ADVANCED" ]] && [[ $ZEEKVERSION == "ZEEK" ]] && whiptail_manager_adv_service_zeeklogs
+
 	# Don't run this function for now since Snort is not yet supported
 	# whiptail_nids
 	NIDS=Suricata
@@ -441,11 +442,11 @@ if [[ $is_sensor && ! $is_eval ]]; then
 	whiptail_homenet_sensor
 	whiptail_sensor_config
 	if [ $NSMSETUP == 'ADVANCED' ]; then
-		whiptail_zeek_pins
+		[[ $ZEEKVERSION == "ZEEK" ]] && whiptail_zeek_pins
 		whiptail_suricata_pins
 		whiptail_bond_nics_mtu
 	else
-		whiptail_basic_zeek
+		[[ $ZEEKVERSION == "ZEEK" ]] && whiptail_basic_zeek
 		whiptail_basic_suri
 	fi
 fi