Merge "Fix exit_trap() error if no child processes"

2014-02-28 01:50:06 +00:00
parent 5f9d3980fc 94b9e82039
commit 5caa58459d
1 changed files with 5 additions and 2 deletions
--- a/stack.sh
+++ b/stack.sh
@@ -591,8 +591,11 @@ fi
 trap exit_trap EXIT
 function exit_trap {
    local r=$?
-    echo "exit_trap called, cleaning up child processes"
-    kill 2>&1 $(jobs -p)
+    jobs=$(jobs -p)
+    if [[ -n $jobs ]]; then
+        echo "exit_trap: cleaning up child processes"
+        kill 2>&1 $jobs
+    fi
    exit $r
 }