remove unnecesary OTHER submenu

This commit is contained in:
Jason Ertel
2023-08-31 20:42:00 -04:00
parent ce2a7135cb
commit 1871d48f7f

View File

@@ -563,7 +563,7 @@ whiptail_install_type() {
"EVAL" "Evaluation mode (not for production) " \ "EVAL" "Evaluation mode (not for production) " \
"STANDALONE" "Standalone production install " \ "STANDALONE" "Standalone production install " \
"DISTRIBUTED" "Distributed install submenu " \ "DISTRIBUTED" "Distributed install submenu " \
"OTHER" "Other install types" \ "DESKTOP" "Install Security Onion Desktop" \
3>&1 1>&2 2>&3 3>&1 1>&2 2>&3
) )
elif [[ "$OSVER" == "focal" ]]; then elif [[ "$OSVER" == "focal" ]]; then
@@ -584,8 +584,6 @@ whiptail_install_type() {
else else
whiptail_install_type_dist_existing whiptail_install_type_dist_existing
fi fi
elif [[ $install_type == "OTHER" ]]; then
whiptail_install_type_other
fi fi
export install_type export install_type
@@ -691,21 +689,6 @@ whiptail_install_type_dist_existing() {
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }
whiptail_install_type_other() {
[ -n "$TESTING" ] && return
install_type=$(whiptail --title "$whiptail_title" --menu \
"Choose node type:" 10 65 2 \
"DESKTOP" "Install Security Onion Desktop " 3>&1 1>&2 2>&3)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
export install_type
}
whiptail_invalid_input() { # TODO: This should accept a list of arguments to specify what general pattern the input should follow whiptail_invalid_input() { # TODO: This should accept a list of arguments to specify what general pattern the input should follow
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return