desktop network install nongrid

setup/so-functions

@@ -1883,7 +1883,7 @@ securityonion_repo() {
 		if [ -n "$(ls -A /etc/yum.repos.d/ 2>/dev/null)" ]; then
 			logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/"
 		fi
-		if [[ ! $is_desktop_grid ]]; then
+		if ! $is_desktop_grid; then
 			gpg_rpm_import
 			if [[ ! $is_airgap ]]; then
 				echo "https://repo.securityonion.net/file/so-repo/prod/2.4/oracle/9" > /etc/yum/mirror.txt

setup/so-setup

@@ -333,7 +333,8 @@ if [[ $is_desktop ]]; then
 		exit 1
 	fi
 
-	if ! whiptail_desktop_install; then
+	whiptail_desktop_install
+	if ! is_desktop_grid; then
 		if [[ $is_desktop_iso ]]; then
 			if whiptail_desktop_nongrid_iso; then
 				# Remove setup from auto launching

setup/so-whiptail

@@ -58,7 +58,11 @@ whiptail_desktop_install() {
 	whiptail --title "$whiptail_title" \
 		--yesno "$message" 11 75 --defaultno
 
-	is_desktop_grid=$?
+	if [ $? -eq 0 ]; then
+		is_desktop_grid=true
+	else
+		is_desktop_grid=false
+	fi
 
 }