From 782c6698358d0cffd406be1128f2972b88666bb1 Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Tue, 2 Jun 2020 12:42:14 -0400
Subject: [PATCH] Fleet standalone fixes - req

---
 setup/so-setup | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index 45452a0a7..c583c4260 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -128,6 +128,7 @@ elif [ "$install_type" = 'HEAVYNODE' ]; then
 	is_sensor=true
 elif [ "$install_type" = 'FLEET' ]; then
 	is_minion=true
+	is_fleet_standalone=true
 	OSQUERY=1
 elif [ "$install_type" = 'HELIXSENSOR' ]; then
 	is_helix=true
@@ -135,12 +136,12 @@ fi
 
 if [[ $is_eval ]]; then
 	check_requirements "eval"
-elif [[ "$is_minon" && "$OSQUERY" == 1 ]]; then
+elif [[ $is_fleet_standalone ]]; then
 	check_requirements "dist" "fleet"
-elif [[ $is_distmaster || $is_minion ]]; then
-	check_requirements "dist"
 elif [[ $is_sensor && ! $is_eval ]]; then
 	check_requirements "dist" "sensor"
+elif [[ $is_distmaster || $is_minion ]]; then
+	check_requirements "dist"
 fi
 
 whiptail_patch_schedule
@@ -236,7 +237,7 @@ if [[ $is_master ]]; then
 	get_redirect
 fi
 
-if [[ $is_distmaster || ( $is_sensor || $is_node || [[ "$is_minon" && "$OSQUERY" == 1 ]] ) && ! $is_eval ]]; then
+if [[ $is_distmaster || ( $is_sensor || $is_node || $is_fleet_standalone ) && ! $is_eval ]]; then
 	whiptail_master_updates
 	if [[ $setup_type == 'network' && $MASTERUPDATES == 1 ]]; then
 		whiptail_master_updates_warning
@@ -328,7 +329,7 @@ if [[ $is_minion ]]; then
 	copy_ssh_key >> $setup_log 2>&1
 fi
 
-if [[ "$is_minon" && "$OSQUERY" == 1 ]]; then
+if [[ $is_fleet_standalone ]]; then
 	host_pillar >> $setup_log 2>&1
 fi