1 files changed, 9 insertions, 7 deletions

@@ -31,8 +31,16 @@ $0 ~ CONFIG["raw_delim"] {
         next
 }
 
+# Shell expansion escape hatch
+{
+        gsub(/\\/, "\\\\", $0)
+        gsub(/\$\$/, "$\a", $0)
+        gsub(/\$[^\a]/, "\\\\&", $0)
+        gsub(/\$\a/, "$", $0)
+        gsub(/`/, "\\`", $0)
+}
+
 RAW {
-        gsub(/[\\\$]/, "\\\\&", $0)
         bufpush(html_escape($0))
         next
 }
@@ -130,11 +138,6 @@ $0 ~ ("^" COMMENT_DELIM) {
                         $0 = templ
                 }
         }
-        # Escape stuff for the shell -- allow $$ to expand
-        gsub(/\$\$/, "$\a", $0)
-        gsub(/\$[^\a]/, "\\\\&", $0)
-        gsub(/\$\a/, "$", $0)
-        gsub(/`/, "\\`", $0)
         # Push to buffer
         bufpush($0, sep)
 }
@@ -161,7 +164,6 @@ END {
         }
 }
 
-
 ### Buffer-y functions
 function buflush()
 {