summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-07-20 17:59:02 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2022-07-20 17:59:02 -0400
commit76989bfefd3609ef6ce33819c7bb0ea8570ec8e1 (patch)
treed5f299f6fc4e77340b1256f7371b013bf8a2d130
parentf9f7c4c2d8dfb07e4fd72d601df6344ce1a460f4 (diff)
Fix exit handler
Our exit handler was returning failure, and causing the whole script to return failure, when we didn't have a temp dir. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--lib/common.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/common.sh b/lib/common.sh
index 75af866..11de1c5 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -3,6 +3,8 @@ set -o nounset
set -o errtrace
set -o errtrace
+trap 'echo "Error $? from: $BASH_COMMAND, exiting" >&2' ERR
+
ktest_tmp=${ktest_tmp:-""}
ktest_exit()
{
@@ -13,6 +15,7 @@ ktest_exit()
fi
[[ -n $ktest_tmp ]] && rm -rf "$ktest_tmp"
+ true
}
trap ktest_exit EXIT