From 4d8b417fc9809afb63787596d2237dbbbb40cd16 Mon Sep 17 00:00:00 2001 From: weslambert Date: Wed, 5 Jan 2022 10:41:27 -0500 Subject: [PATCH 1/2] Denote which branch is being used in SOUP if BRANCH is specified --- salt/common/tools/sbin/soup | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 50c925d22..708f519d4 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -1178,8 +1178,16 @@ Please review the following for more information about the update process and re https://docs.securityonion.net/soup https://blog.securityonion.net -Press Enter to continue or Ctrl-C to cancel. +EOF +if [ -n "$BRANCH" ]; then + cat << EOF +SOUP will use the $BRANCH branch. + +EOF +fi + cat << EOF +Press Enter to continue or Ctrl-C to cancel. EOF read -r input From db43e21378fb2c301afeabaabb039ecc1c3059d2 Mon Sep 17 00:00:00 2001 From: weslambert Date: Wed, 5 Jan 2022 10:46:41 -0500 Subject: [PATCH 2/2] Fix indentation --- salt/common/tools/sbin/soup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 708f519d4..d5a73666b 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -1180,12 +1180,12 @@ https://blog.securityonion.net EOF -if [ -n "$BRANCH" ]; then - cat << EOF + if [ -n "$BRANCH" ]; then + cat << EOF SOUP will use the $BRANCH branch. EOF -fi + fi cat << EOF Press Enter to continue or Ctrl-C to cancel. EOF