Allow spaces in suppress() args

common_utils.sh

@@ -117,13 +117,14 @@ function suppress {
     # Set -e stuff agonized over in
     # https://unix.stackexchange.com/questions/296526/set-e-in-a-subshell
     local tmp=$(mktemp tmp.XXXXXXXXX) || return
-    local opts=$-
+    local ERREXIT_SET OUT
     echo "Running $@"
+    if [[ $- = *e* ]]; then ERREXIT_SET=true; fi
     set +e
-    ( set_opts $opts ; $@  > "$tmp" 2>&1 ) ; ret=$?
+    ( if [[ -n $ERREXIT_SET ]]; then set -e; fi; "$@"  > "$tmp" 2>&1 ) ; ret=$?
     [ "$ret" -eq 0 ] || cat "$tmp"
     rm -f "$tmp"
-    set_opts $opts
+    if [[ -n $ERREXIT_SET ]]; then set -e; fi
     return "$ret"
 }
 

tests/test_common_utils.sh

@@ -69,6 +69,8 @@ ORIG_OPTS=$-
 set +ex
 [ "$(suppress bad_cmd)" == "$(printf "Running bad_cmd\nbad")" ] \
     || ingest "suppress bad_cmd"
+suppress bash -c '! false' &>/dev/null \
+    || ingest "suppress cmd with space"
 [ "$(suppress good_cmd)" == "Running good_cmd" ] \
     || ingest "suppress good_cmd"
 [ "$(suppress bad_mid_cmd)" == "Running bad_mid_cmd" ] \