properly carry forward error returns

1 files changed, 6 insertions, 1 deletions

diff --git a/wordpress/export-json.bash b/wordpress/export-json.bash
index 7f5c5d3..033dcb3 100644
--- a/wordpress/export-json.bash
+++ b/wordpress/export-json.bash
@@ -102,9 +102,13 @@ safe_stdout()
         set -- "$(mktemp)" "$@"
         if (shift; "$@") > "$1"
         then
+                r=0
                 cat < "$1"
+        else
+                r=$?
         fi
         rm "$1"
+        return $r
 }
 
 export_JSON()
@@ -115,7 +119,7 @@ export_JSON()
 try()
 {
         "$@"
-        : printf '%s -> %s\n' "${*@Q}" "$?" >&2
+        printf '(Exit %s) <- [%s]\n' "$?" "${*@Q}" >&2
 }
 
 runtest()
@@ -124,6 +128,7 @@ runtest()
         try export_JSON "$@"
         unset unsetvar
         try export_JSON SSH_TTY unsetvar
+        try export_JSON unsetvar SSH_TTY
         try export_JSON
         try export_JSON ''
         try export_JSON '' SSH_TTY