From dc350337e71d9a69f9535520de515f78d6bf82af Mon Sep 17 00:00:00 2001
From: root <root@vps-18a7a2b7.vps.ovh.ca>
Date: Wed, 24 Jan 2024 13:51:34 -0500
Subject: properly carry forward error returns

---
 wordpress/export-json.bash | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'wordpress/export-json.bash')

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
-- 
cgit v1.2.3