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

Try to fix bash trap

Browse Source
This commit is contained in:
William Wernert
2021-05-10 11:59:22 -04:00
parent d3b08beb53
commit fec868432f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,12 @@ WHATWOULDYOUSAYYAHDOHERE=soup
set -e set -e
trap 'check_err $? $BASH_LINENO $BASH_COMMAND' EXIT trap 'check_err $? $BASH_LINENO' EXIT
check_err() { check_err() {
local exit_code=$1 local exit_code=$1
local lineno=$2 local lineno=$2
local cmd=$3 local err_msg="Unhandled error occured, please check $SOUP_LOG for details."
local err_msg="Unknown error occured, please check $SOUP_LOG for details."
if [[ $exit_code -ne 0 ]]; then if [[ $exit_code -ne 0 ]]; then
printf '%s' "Soup failed on line $lineno with error $exit_code: " printf '%s' "Soup failed on line $lineno with error $exit_code: "
@@ -86,7 +85,7 @@ check_err() {
echo 'No route to host' echo 'No route to host'
;; ;;
*) *)
echo '' echo 'Unhandled error'
echo "$err_msg" echo "$err_msg"
;; ;;
esac esac