From 03144446c8993207e1ff1ec18801acdf5c5869df Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 29 Jul 2020 14:59:00 -0400 Subject: [PATCH] revert branch to original code --- salt/common/tools/sbin/soup | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 8a10231b5..dbf02b4ad 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -20,7 +20,6 @@ UPDATE_DIR=/tmp/sogh/securityonion INSTALLEDVERSION=$(cat /etc/soversion) INSTALLEDSALTVERSION=$(salt --versions-report | grep Salt: | awk {'print $2'}) default_salt_dir=/opt/so/saltstack/default -SOUP_BRANCH=$1 BATCHSIZE=5 manager_check() { @@ -46,11 +45,11 @@ clone_to_tmp() { # Make a temp location for the files mkdir -p /tmp/sogh cd /tmp/sogh - if [ -n "$SOUP_BRANCH" ]; then - git clone -b $SOUP_BRANCH https://github.com/Security-Onion-Solutions/securityonion.git - else - git clone https://github.com/Security-Onion-Solutions/securityonion.git + SOUP_BRANCH="" + if [ -n "$BRANCH" ]; then + SOUP_BRANCH="-b $BRANCH" fi + git clone $SOUP_BRANCH https://github.com/Security-Onion-Solutions/securityonion.git cd /tmp if [ ! -f $UPDATE_DIR/VERSION ]; then echo "Update was unable to pull from github. Please check your internet."