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

Use exit code 0 when printing error message before exiting soup

Browse Source
This commit is contained in:
William Wernert
2021-09-01 15:11:18 -04:00
parent 576c893eb3
commit 446821e9fd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,7 +127,7 @@ EOF
if [ ! -f /tmp/soagupdate/SecurityOnion/VERSION ]; then if [ ! -f /tmp/soagupdate/SecurityOnion/VERSION ]; then
echo "Something went wrong trying to mount the ISO." echo "Something went wrong trying to mount the ISO."
echo "Ensure you verify the ISO that you downloaded." echo "Ensure you verify the ISO that you downloaded."
exit 1 exit 0
else else
echo "ISO has been mounted!" echo "ISO has been mounted!"
fi fi
@@ -140,14 +140,14 @@ EOF
if [ ! -f /tmp/soagupdate/SecurityOnion/VERSION ]; then if [ ! -f /tmp/soagupdate/SecurityOnion/VERSION ]; then
echo "Something went wrong trying to mount the device." echo "Something went wrong trying to mount the device."
echo "Ensure you verify the ISO that you downloaded." echo "Ensure you verify the ISO that you downloaded."
exit 1 exit 0
else else
echo "Device has been mounted!" echo "Device has been mounted!"
fi fi
else else
echo "Could not find Security Onion ISO content at ${ISOLOC}" echo "Could not find Security Onion ISO content at ${ISOLOC}"
echo "Ensure the path you entered is correct, and that you verify the ISO that you downloaded." echo "Ensure the path you entered is correct, and that you verify the ISO that you downloaded."
exit 1 exit 0
fi fi
fi fi
} }
@@ -157,7 +157,7 @@ airgap_update_dockers() {
# Let's copy the tarball # Let's copy the tarball
if [[ ! -f $AGDOCKER/registry.tar ]]; then if [[ ! -f $AGDOCKER/registry.tar ]]; then
echo "Unable to locate registry. Exiting" echo "Unable to locate registry. Exiting"
exit 1 exit 0
else else
echo "Stopping the registry docker" echo "Stopping the registry docker"
docker stop so-dockerregistry docker stop so-dockerregistry
@@ -631,7 +631,7 @@ upgrade_space() {
clean_dockers clean_dockers
if ! verify_upgradespace; then if ! verify_upgradespace; then
echo "There is not enough space to perform the upgrade. Please free up space and try again" echo "There is not enough space to perform the upgrade. Please free up space and try again"
exit 1 exit 0
fi fi
else else
echo "You have enough space for upgrade. Proceeding with soup." echo "You have enough space for upgrade. Proceeding with soup."
@@ -788,7 +788,7 @@ main() {
check_airgap check_airgap
if [[ $is_airgap -eq 0 && $UNATTENDED == true && -z $ISOLOC ]]; then if [[ $is_airgap -eq 0 && $UNATTENDED == true && -z $ISOLOC ]]; then
echo "Missing file argument for unattended airgap upgrade." echo "Missing file argument for unattended airgap upgrade."
exit 1 exit 0
fi fi
echo "Checking to see if this is a manager." echo "Checking to see if this is a manager."
echo "" echo ""
@@ -885,7 +885,7 @@ main() {
echo "Once the issue is resolved, run soup again." echo "Once the issue is resolved, run soup again."
echo "Exiting." echo "Exiting."
echo "" echo ""
exit 1 exit 0
else else
echo "Salt upgrade success." echo "Salt upgrade success."
echo "" echo ""