From 46e7d29f12d0d67be8353071bc557439db57b7e6 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Wed, 22 Jul 2020 14:35:50 -0400 Subject: [PATCH] Add support for custom branches in soup --- VERSION | 2 +- salt/common/tools/sbin/soup | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d0c10bc48..0637814cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-rc.1 \ No newline at end of file +2.0.1-rc.1 \ No newline at end of file diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 878372e68..44c32280e 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -43,8 +43,11 @@ clone_to_tmp() { # Make a temp location for the files mkdir -p /tmp/sogh cd /tmp/sogh - #git clone -b dev https://github.com/Security-Onion-Solutions/securityonion.git - 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."