From c1e32ed68054c8a7486a6768d5ce0f95be1bc9e8 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Thu, 7 Jan 2021 10:36:32 -0500 Subject: [PATCH] [refactor] Rename MD tool function to be more clear --- setup/so-whiptail | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/setup/so-whiptail b/setup/so-whiptail index 49dc49b22..0a72f1e3b 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -65,18 +65,6 @@ whiptail_basic_zeek() { whiptail_check_exitstatus $exitstatus } -whiptail_zeek_version() { - - [ -n "$TESTING" ] && return - - ZEEKVERSION=$(whiptail --title "Security Onion Setup" --radiolist "What tool would you like to use to generate metadata?" 20 75 4 \ - "ZEEK" "Zeek (formerly known as Bro)" ON \ - "SURICATA" "Suricata" OFF 3>&1 1>&2 2>&3) - - local exitstatus=$? - whiptail_check_exitstatus $exitstatus -} - whiptail_bond_nics_mtu() { [ -n "$TESTING" ] && return @@ -500,6 +488,8 @@ whiptail_helix_apikey() { } +#TODO: Combine these two functions + whiptail_homenet_manager() { [ -n "$TESTING" ] && return @@ -1572,14 +1562,16 @@ whiptail_zeek_pins() { IFS=' ' read -ra ZEEKPINS <<< "$ZEEKPINS" } -whiptail_zeek_version() { +whiptail_metadata_tool() { [ -n "$TESTING" ] && return - ZEEKVERSION=$(whiptail --title "Security Onion Setup" --radiolist "What tool would you like to use to generate metadata?" 20 75 4 "ZEEK" "Zeek (formerly known as Bro)" ON \ + # Legacy variable naming + ZEEKVERSION=$(whiptail --title "Security Onion Setup" --radiolist "What tool would you like to use to generate metadata?" 20 75 4 \ + "ZEEK" "Zeek (formerly known as Bro)" ON \ "SURICATA" "Suricata" OFF 3>&1 1>&2 2>&3) local exitstatus=$? whiptail_check_exitstatus $exitstatus - } +