CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

move branch echo to main so it is in the log

Browse Source
This commit is contained in:
m0duspwnens
2022-01-12 16:14:49 -05:00
parent 03b9b74ace
commit 443dc6ebaa
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
salt/common/tools/sbin/soup
View File

@@ -958,7 +958,18 @@ fix_wazuh() {
main() { main() {
trap 'check_err $?' EXIT trap 'check_err $?' EXIT
if [ -n "$BRANCH" ]; then
echo "SOUP will use the $BRANCH branch."
echo ""
fi
echo "### Preparing soup at $(date) ###" echo "### Preparing soup at $(date) ###"
echo ""
echo "Checking to see if this is a manager."
echo ""
require_manager
check_pillar_items check_pillar_items
echo "Checking to see if this is an airgap install." echo "Checking to see if this is an airgap install."
@@ -968,9 +979,7 @@ main() {
echo "Missing file argument (-f <FILENAME>) for unattended airgap upgrade." echo "Missing file argument (-f <FILENAME>) for unattended airgap upgrade."
exit 0 exit 0
fi fi
echo "Checking to see if this is a manager."
echo ""
require_manager
set_minionid set_minionid
echo "Found that Security Onion $INSTALLEDVERSION is currently installed." echo "Found that Security Onion $INSTALLEDVERSION is currently installed."
echo "" echo ""
@@ -1277,12 +1286,6 @@ https://blog.securityonion.net
EOF EOF
if [ -n "$BRANCH" ]; then
cat << EOF
SOUP will use the $BRANCH branch.
EOF
fi
cat << EOF cat << EOF
Press Enter to continue or Ctrl-C to cancel. Press Enter to continue or Ctrl-C to cancel.
EOF EOF