From 5d936e5c8a2af0920c728cc5c7d98c093f49c01b Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Mon, 30 Jul 2018 17:09:05 -0700 Subject: [PATCH] Trap SIGINT for clean ^C shutdown --- ci/localnet-sanity.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh index 59b7d346d..f730732a3 100755 --- a/ci/localnet-sanity.sh +++ b/ci/localnet-sanity.sh @@ -22,6 +22,7 @@ for cmd in $backgroundCommands; do done shutdown() { + exitcode=$? set +e echo --- Shutdown for pid in "${pids[@]}"; do @@ -37,9 +38,11 @@ shutdown() { upload_ci_artifact "$logfile" tail "$logfile" done + + exit $exitcode } -trap shutdown EXIT +trap shutdown EXIT INT set -e