fix: improve blockexplorer.sh abort handling

solana-labs · Feb 17, 2019 · 72c6bee · 72c6bee
1 parent 97b1bd6
commit 72c6bee
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/bin/blockexplorer.sh b/bin/blockexplorer.sh
@@ -20,8 +20,15 @@ if [[ ! -d build || ! -f build/api/api.js ]]; then
   exit 1
 fi
 
-set -x
+cleanup() {
+  set +e
+  for pid in "$api" "$ui"; do
+    [[ -z $pid ]] || kill "$pid"
+  done
+}
+trap cleanup SIGINT SIGTERM
 
+set -x
 redis-cli ping
 
 node build/api/api.js &
@@ -30,10 +37,6 @@ api=$!
 PORT=80 npx serve -s build &
 ui=$!
 
-abort() {
-  kill "$api" "$ui"
-}
-
-trap abort SIGINT SIGTERM
 wait "$ui"
-kill "$api" "$ui"
+ui=
+cleanup