fixed the null sub problem

1 files changed, 5 insertions, 5 deletions

diff --git a/functions b/functions
index 9cc2c8d..94d199f 100644
--- a/functions
+++ b/functions
@@ -154,16 +154,16 @@ substitute_vars() {(
 	touch sed.$$
 	for v in $VARS; do
 	    # variable variables are fun .....
-	    s=${!v:-__notset__}
+	    [ "${!v+x}" ] || {
+		echo "ERROR: No substitution given for ${delim2}$v${delim2} in $infile"
+		exit 1
+	    }
+	    s=${!v}
 	    # escape some pesky chars
 	    s=${s//
 /\\n}
 	    s=${s//#/\\#}
 	    s=${s//&/\\&}
-	    [ "$s" = "__notset__" ] && {
-		echo "ERROR: No substitution given for ${delim2}$v${delim2} in $infile"
-		exit 1
-	    }
 	    echo "s#@@$v@@#$s#g" >> sed.$$
 	done