From 4a23c47a924116b4ac8b8afb68ce1f372fa5c448 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Wed, 17 Apr 2024 01:44:57 +0200 Subject: Adjust shell quoting --- acid.go | 2 +- acid_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acid.go b/acid.go index 2c59c38..17ca23b 100644 --- a/acid.go +++ b/acid.go @@ -102,7 +102,7 @@ var shellFuncs = ttemplate.FuncMap{ "quote": func(word string) string { // History expansion is annoying, don't let it cut us. if strings.IndexRune(word, '!') >= 0 { - return "'" + strings.ReplaceAll(word, "'", `'"'"'`) + "'" + return "'" + strings.ReplaceAll(word, "'", `'\''`) + "'" } const special = "$`\"\\" diff --git a/acid_test.go b/acid_test.go index f23d892..614fd0a 100644 --- a/acid_test.go +++ b/acid_test.go @@ -12,7 +12,7 @@ func TestTemplateQuote(t *testing.T) { for _, test := range []struct { input, output string }{ - {`!!`, `'!!'`}, + {`!!'!$`, `'!!'\''!$'`}, {``, `""`}, {`${var}`, `"\${var}"`}, {"`cat`", "\"\\`cat\\`\""}, -- cgit v1.2.3-70-g09d2