1 files changed, 3 insertions, 4 deletions

@@ -11,13 +11,12 @@ BEGIN {
         dryrun = dryrun ? dryrun : 0
         sopath = sopath ? sopath : ".:" ENVIRON["HOME"] "/.subtext"
         shxend = shxend ? shxend : "%%end"
-        ## Kernel
+        ## Shellfix: escape ` and $ in input
         # Ask sed to do these b/c awk has no capture groups ;_;
         shellfix = "sed -E" \
                 " -e 's/`/\\\\`/g'" \
                 " -e 's/(^|[^\\$])\\$([^\\$]|$)/\\1\\\\$\\2/g'" \
                 " -e 's/(^|[^\\$])\\$(\\$+)([^\\$]|$)/\\1\\2\\3/g'"
-        shxquote = " -e 's/^/:/'"
 }
 
 /\\$/ { # line continuation
@@ -77,8 +76,8 @@ END {
         print "### body"
         print "body(){ unquote : << \\_ | shexpand"
         pushpar()
-        print body | (shellfix shxquote)
-        close(shellfix shxquote)
+        print body | (shellfix " -e 's/^/:/'")
+        close(shellfix " -e 's/^/:/'")
         print "_"
         print "}"
         if (!dryrun) print "body"