From 8907c8316f93e20311e30769920061ef71eaccb8 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Mon, 8 Apr 2019 19:45:38 -0400
Subject: [PATCH] Setup - Make sure install completes properly

---
 so-setup-network.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/so-setup-network.sh b/so-setup-network.sh
index 938f527cf..5a36b04b7 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -1855,26 +1855,26 @@ if (whiptail_you_sure); then
       echo -e "XXX\n25\nInstalling master components... \nXXX"
       salt-call state.apply master >>~/sosetup.log 2>&1
       salt-call state.apply idstools >>~/sosetup.log 2>&1
-      if [ $EVALOSQUERY == 0 ]; then
+      if [ $EVALOSQUERY == '0' ]; then
         salt-call state.apply mysql >>~/sosetup.log 2>&1
       fi
       echo -e "XXX\n35\nInstalling Elastic components... \nXXX"
       salt-call state.apply elasticsearch >>~/sosetup.log 2>&1
       salt-call state.apply logstash >>~/sosetup.log 2>&1
       salt-call state.apply kibana >>~/sosetup.log 2>&1
-      echo -e "XXX\n50\nInstalling NSM components... \nXXX"
+      echo -e "XXX\n50\nInstalling pcap... \nXXX"
       salt-call state.apply pcap >>~/sosetup.log 2>&1
       salt-call state.apply suricata >>~/sosetup.log 2>&1
       salt-call state.apply bro >>~/sosetup.log 2>&1
       salt-call state.apply curator >>~/sosetup.log 2>&1
       salt-call state.apply elastalert >>~/sosetup.log 2>&1
-      if [ $EVALOSQUERY == 0 ]; then
+      if [ $EVALOSQUERY == '0' ]; then
         echo -e "XXX\n60\nInstalling fleet... \nXXX"
         salt-call state.apply fleet >>~/sosetup.log 2>&1
         salt-call state.apply redis >>~/sosetup.log 2>&1
       fi
-      if [ $EVALWAZUH == 0 ]; then
-        echo -e "XXX\n65\nInstalling Elastic components... \nXXX"
+      if [ $EVALWAZUH == '0' ]; then
+        echo -e "XXX\n65\nInstalling Wazuh components... \nXXX"
         salt-call state.apply wazuh >>~/sosetup.log 2>&1
       fi
       echo -e "XXX\n85\nInstalling filebeat... \nXXX"
@@ -1891,13 +1891,13 @@ if (whiptail_you_sure); then
     } |whiptail --title "Hybrid Hunter Install" --gauge "Please wait while installing" 6 60 0
     GOODSETUP=$(tail -10 sosetup.log | grep Failed | awk '{ print $2}')
     if [ $OS == 'centos' ]; then
-      if [ $GOODSETUP == 1 ]; then
+      if [ $GOODSETUP == '1' ]; then
         whiptail_setup_complete
       else
         whiptail_setup_failed
       fi
     else
-      if [ $GOODSETUP == 0 ]; then
+      if [ $GOODSETUP == '0' ]; then
         whiptail_setup_complete
       else
         whiptail_setup_failed