Merge pull request #5890 from Security-Onion-Solutions/foxtrot

Misc setup changes

setup/so-setup

@@ -256,7 +256,8 @@ elif [ "$install_type" = 'HELIXSENSOR' ]; then
 elif [ "$install_type" = 'IMPORT' ]; then
 	is_import=true
 elif [ "$install_type" = 'ANALYST' ]; then
-	is_analyst=true
+	cd .. || exit 255
+	exec bash so-analyst-install
 fi
 
 if [[ $is_manager || $is_import ]]; then
@@ -337,11 +338,6 @@ if ! [[ -f $install_opt_file ]]; then
 		exec bash /root/manager_setup/securityonion/setup/so-setup "${original_args[@]}"
 	fi
 
-	if [[ $is_analyst ]]; then
-		cd .. || exit 255
-		exec bash so-analyst-install
-	fi
-
 else
 	rm -rf $install_opt_file >> "$setup_log" 2>&1
 fi
@@ -939,7 +935,6 @@ if [[ -n $SO_ERROR ]]; then
 
 	SKIP_REBOOT=1
 	whiptail_setup_failed
-
 else 
 	echo "Successfully completed setup! Continuing with post-installation steps" >> $setup_log 2>&1
 	{
@@ -974,9 +969,9 @@ else
 
 	} | whiptail_gauge_post_setup "Running post-installation steps..."
 
+	echo "Post-installation steps have completed. Awaiting user input to clean up installer." >> $setup_log 2>&1
 	whiptail_setup_complete
 	[[ $setup_type != 'iso' ]] && whitpail_ssh_warning
-	echo "Post-installation steps have completed." >> $setup_log 2>&1
 fi
 
 install_cleanup >> "$setup_log" 2>&1