From f42a39ca690cce6d13e675104c3851f379edc1f8 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 27 Jul 2020 18:08:27 -0400
Subject: [PATCH] allow soup to continue update if branch is specified

---
 salt/common/tools/sbin/soup | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 280a9abb1..d4ec9c0ab 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -152,13 +152,8 @@ update_version() {
 
 upgrade_check() {
     # Let's make sure we actually need to update.
-    if [ -n "$SOUP_BRANCH" ]; then
-      NEWVERSION="$SOUP_BRANCH"
-    else
-      NEWVERSION=$(cat $UPDATE_DIR/VERSION)
-    fi
-    
-    if [ "$INSTALLEDVERSION" == "$NEWVERSION" ]; then
+    NEWVERSION=$(cat $UPDATE_DIR/VERSION)
+    if [ "$INSTALLEDVERSION" == "$NEWVERSION" ] &&  [ -z "$SOUP_BRANCH" ]; then
       echo "You are already running the latest version of Security Onion."
       exit 0
     fi 
@@ -209,6 +204,7 @@ echo ""
 echo "Verifying we have the latest script"
 verify_latest_update_script
 echo ""
+
 echo "Let's see if we need to update"
 upgrade_check