Allow colons in command portion of template flag

srcnix · Oct 30, 2017 · d12253b · d12253b
1 parent 873596d
commit d12253b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/config/template.go b/config/template.go
@@ -399,7 +399,8 @@ func ParseTemplateConfig(s string) (*TemplateConfig, error) {
 	case 3:
 		source, destination, command = parts[0], parts[1], parts[2]
 	default:
-		return nil, ErrTemplateInvalidFormat
+		source, destination = parts[0], parts[1]
+		command = strings.Join(parts[2:], ":")
 	}
 
 	var sourcePtr, destinationPtr, commandPtr *string

diff --git a/config/template_test.go b/config/template_test.go
@@ -497,12 +497,6 @@ func TestParseTemplateConfig(t *testing.T) {
 			nil,
 			true,
 		},
-		{
-			"too_many_args",
-			"foo:bar:zip:zap",
-			nil,
-			true,
-		},
 		{
 			"default",
 			"/tmp/a.txt:/tmp/b.txt:command",
@@ -513,6 +507,22 @@ func TestParseTemplateConfig(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"single",
+			"/tmp/a.txt",
+			&TemplateConfig{
+				Source: String("/tmp/a.txt"),
+			},
+			false,
+		},
+		{
+			"single_windows_drive",
+			`z:\foo`,
+			&TemplateConfig{
+				Source: String(`z:\foo`),
+			},
+			false,
+		},
 		{
 			"windows_drives",
 			`C:\abc\123:D:\xyz\789:command`,
@@ -523,6 +533,16 @@ func TestParseTemplateConfig(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"windows_drives_with_colon",
+			`C:\abc\123:D:\xyz\789:sub:command`,
+			&TemplateConfig{
+				Source:      String(`C:\abc\123`),
+				Destination: String(`D:\xyz\789`),
+				Command:     String(`sub:command`),
+			},
+			false,
+		},
 	}
 
 	for i, tc := range cases {