Fix Analyst Install Loop

This commit is contained in:
Mike Reeves
2022-04-18 11:02:19 -04:00
parent 891a197a6a
commit 012ff3e1bc
2 changed files with 8 additions and 14 deletions

View File

@@ -351,7 +351,9 @@ elif [ "$install_type" = 'RECEIVER' ]; then
is_minion=true is_minion=true
is_receiver=true is_receiver=true
elif [ "$install_type" = 'ANALYST' ]; then elif [ "$install_type" = 'ANALYST' ]; then
exec bash so-setup analyst if [ "$setup_type" != 'analyst' ]; then
exec bash so-setup analyst
fi
fi fi
if [[ $is_manager || $is_import ]]; then if [[ $is_manager || $is_import ]]; then

View File

@@ -934,20 +934,12 @@ whiptail_install_type_other() {
# so-analyst-install will only work with a working network connection # so-analyst-install will only work with a working network connection
# so only show it on network installs for now # so only show it on network installs for now
if [[ $setup_type == 'network' ]]; then install_type=$(whiptail --title "$whiptail_title" --radiolist \
install_type=$(whiptail --title "$whiptail_title" --radiolist \
"Choose node type:" 9 65 2 \ "Choose node type:" 9 65 2 \
"ANALYST" "Setup will run 'so-setup analyst' " ON \ "ANALYST" "Setup will run 'so-setup analyst' " ON \
"HELIXSENSOR" "Create a Helix sensor " OFF \ "HELIXSENSOR" "Create a Helix sensor " OFF \
3>&1 1>&2 2>&3 3>&1 1>&2 2>&3
) )
else
install_type=$(whiptail --title "$whiptail_title" --radiolist \
"Choose node type:" 8 65 1 \
"HELIXSENSOR" "Create a Helix sensor " ON \
3>&1 1>&2 2>&3
)
fi
local exitstatus=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus