Fix wildcard sync command if files have special characters

peak · Oct 1, 2024 · 12d1038 · 12d1038
1 parent c280956
commit 12d1038
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/command/context.go b/command/context.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/kballard/go-shellquote"
 	"github.com/peak/s5cmd/v2/storage/url"
 	"github.com/urfave/cli/v2"
 )
@@ -68,7 +69,7 @@ func generateCommand(c *cli.Context, cmd string, defaultFlags map[string]interfa
 
 	var args []string
 	for _, url := range urls {
-		args = append(args, fmt.Sprintf("%q", url.String()))
+		args = append(args, shellquote.Join(url.String()))
 	}
 
 	flags := []string{}

diff --git a/command/context_test.go b/command/context_test.go
@@ -31,7 +31,17 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "s3://bucket/key1"),
 				mustNewURL(t, "s3://bucket/key2"),
 			},
-			expectedCommand: `cp "s3://bucket/key1" "s3://bucket/key2"`,
+			expectedCommand: `cp s3://bucket/key1 s3://bucket/key2`,
+		},
+		{
+			name:  "empty-cli-flags-with-special-char",
+			cmd:   "cp",
+			flags: []cli.Flag{},
+			urls: []*url.URL{
+				mustNewURL(t, "s3://bucket/key '\"1"),
+				mustNewURL(t, "s3://bucket/key2"),
+			},
+			expectedCommand: `cp 's3://bucket/key '\''"1' s3://bucket/key2`,
 		},
 		{
 			name:  "empty-cli-flags-with-default-flags",
@@ -45,7 +55,7 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "s3://bucket/key1"),
 				mustNewURL(t, "s3://bucket/key2"),
 			},
-			expectedCommand: `cp --acl='public-read' --raw='true' "s3://bucket/key1" "s3://bucket/key2"`,
+			expectedCommand: `cp --acl='public-read' --raw='true' s3://bucket/key1 s3://bucket/key2`,
 		},
 		{
 			name: "cli-flag-with-whitespaced-flag-value",
@@ -63,7 +73,7 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "s3://bucket/key1"),
 				mustNewURL(t, "s3://bucket/key2"),
 			},
-			expectedCommand: `cp --cache-control='public, max-age=31536000, immutable' --raw='true' "s3://bucket/key1" "s3://bucket/key2"`,
+			expectedCommand: `cp --cache-control='public, max-age=31536000, immutable' --raw='true' s3://bucket/key1 s3://bucket/key2`,
 		},
 		{
 			name: "same-flag-should-be-ignored-if-given-from-both-default-and-cli-flags",
@@ -81,7 +91,7 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "s3://bucket/key1"),
 				mustNewURL(t, "s3://bucket/key2"),
 			},
-			expectedCommand: `cp --raw='true' "s3://bucket/key1" "s3://bucket/key2"`,
+			expectedCommand: `cp --raw='true' s3://bucket/key1 s3://bucket/key2`,
 		},
 		{
 			name: "ignore-non-shared-flag",
@@ -118,7 +128,7 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "s3://bucket/key1"),
 				mustNewURL(t, "s3://bucket/key2"),
 			},
-			expectedCommand: `cp --concurrency='6' --flatten='true' --force-glacier-transfer='true' --raw='true' "s3://bucket/key1" "s3://bucket/key2"`,
+			expectedCommand: `cp --concurrency='6' --flatten='true' --force-glacier-transfer='true' --raw='true' s3://bucket/key1 s3://bucket/key2`,
 		},
 		{
 			name: "string-slice-flag",
@@ -133,7 +143,7 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "/source/dir"),
 				mustNewURL(t, "s3://bucket/prefix/"),
 			},
-			expectedCommand: `cp --exclude='*.log' --exclude='*.txt' "/source/dir" "s3://bucket/prefix/"`,
+			expectedCommand: `cp --exclude='*.log' --exclude='*.txt' /source/dir s3://bucket/prefix/`,
 		},
 		{
 			name:  "command-with-multiple-args",
@@ -142,10 +152,11 @@ func TestGenerateCommand(t *testing.T) {
 			urls: []*url.URL{
 				mustNewURL(t, "s3://bucket/key1"),
 				mustNewURL(t, "s3://bucket/key2"),
+				mustNewURL(t, "s3://bucket/key3 .txt"),
 				mustNewURL(t, "s3://bucket/prefix/key3"),
 				mustNewURL(t, "s3://bucket/prefix/key4"),
 			},
-			expectedCommand: `rm "s3://bucket/key1" "s3://bucket/key2" "s3://bucket/prefix/key3" "s3://bucket/prefix/key4"`,
+			expectedCommand: `rm s3://bucket/key1 s3://bucket/key2 's3://bucket/key3 .txt' s3://bucket/prefix/key3 s3://bucket/prefix/key4`,
 		},
 		{
 			name:  "command-args-with-spaces",
@@ -155,7 +166,7 @@ func TestGenerateCommand(t *testing.T) {
 				mustNewURL(t, "file with space"),
 				mustNewURL(t, "wow wow"),
 			},
-			expectedCommand: `rm "file with space" "wow wow"`,
+			expectedCommand: `rm 'file with space' 'wow wow'`,
 		},
 	}
 	for _, tc := range testcases {