correcly escape ldflags (therecipe/pull/1048 from @domust)

akiyosi · akiyosi · commit 7249f85cbbb3 · 2023-07-16T00:31:59.000+09:00
diff --git a/internal/cmd/deploy/build_escape.go b/internal/cmd/deploy/build_escape.go
@@ -31,8 +31,8 @@ func escapeFlags(ldFlags []string, ldFlagsCustom string) string {
 		ldFlags = append(ldFlags, strings.Split(ldFlagsCustom, " ")...)
 	}
 
-	if out := strings.Replace(strings.Join(ldFlags, "\" \""), "_DONT_ESCAPE_", " ", -1); len(out) > 0 {
-		return fmt.Sprintf("\"%v\"", out)
+	if out := strings.Replace(strings.Join(ldFlags, " "), "_DONT_ESCAPE_", " ", -1); len(out) > 0 {
+		return fmt.Sprintf("%q", out)
 	}
 	return ""
 }

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ func escapeFlags(ldFlags []string, ldFlagsCustom string) string {`
`31`	`31`	`ldFlags = append(ldFlags, strings.Split(ldFlagsCustom, " ")...)`
`32`	`32`	`}`
`33`	`33`
`34`		`- if out := strings.Replace(strings.Join(ldFlags, "\" \""), "_DONT_ESCAPE_", " ", -1); len(out) > 0 {`
`35`		`- return fmt.Sprintf("\"%v\"", out)`
	`34`	`+ if out := strings.Replace(strings.Join(ldFlags, " "), "_DONT_ESCAPE_", " ", -1); len(out) > 0 {`
	`35`	`+ return fmt.Sprintf("%q", out)`
`36`	`36`	`}`
`37`	`37`	`return ""`
`38`	`38`	`}`