Fix some installs

This commit is contained in:
Mike Reeves
2023-06-26 16:01:58 -04:00
parent b6986d5c61
commit 740723ecd6
4 changed files with 38 additions and 41 deletions

View File

@@ -27,15 +27,15 @@ whiptail_airgap() {
fi
}
whiptail_analyst_install() {
whiptail_desktop_install() {
[ -n "$TESTING" ] && return
read -r -d '' message <<- EOM
Welcome to the Security Onion Analyst Workstation install!
Welcome to the Security Onion Desktop install!
Would you like to join this workstation to an existing grid?
Would you like to join this desktop to an existing grid?
EOM
whiptail --title "$whiptail_title" \
@@ -43,13 +43,13 @@ whiptail_analyst_install() {
}
whiptail_analyst_nongrid_iso() {
whiptail_desktop_nongrid_iso() {
[ -n "$TESTING" ] && return
read -r -d '' message <<- EOM
You have selected this Analyst workstation to be independent.
You have selected this Security Onion Desktop to be independent.
Would you still like to have the graphical interface loaded at boot?
@@ -61,13 +61,13 @@ whiptail_analyst_nongrid_iso() {
}
whiptail_analyst_nongrid_network() {
whiptail_desktop_nongrid_network() {
[ -n "$TESTING" ] && return
read -r -d '' message <<- EOM
You have selected this Analyst workstation to be independent.
You have selected this Security Onion Desktop to be independent.
Would you still like to install and load the graphical interface?
@@ -651,9 +651,9 @@ whiptail_install_type_dist_existing() {
is_import=true
elif [ "$install_type" = 'RECEIVER' ]; then
is_receiver=true
elif [ "$install_type" = 'ANALYST' ]; then
if [ "$setup_type" != 'analyst' ]; then
exec bash so-setup analyst
elif [ "$install_type" = 'DESKTOP' ]; then
if [ "$setup_type" != 'desktop' ]; then
exec bash so-setup desktop
fi
fi
@@ -668,10 +668,7 @@ whiptail_install_type_other() {
install_type=$(whiptail --title "$whiptail_title" --menu \
"Choose node type:" 10 65 2 \
"ANALYST" "Setup will run 'so-setup analyst' " \
"HELIXSENSOR" "Create a Helix sensor " \
3>&1 1>&2 2>&3
)
"DESKTOP" "Setup will run 'so-setup desktop' " 3>&1 1>&2 2>&3)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus