KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix parsing of copy args

Browse Source
This commit is contained in:
Kovid Goyal 2023-02-19 19:23:32 +05:30
parent d98504e1a6
commit 041c646d46
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/cmd/ssh/config.go
View File

@ -180,7 +180,7 @@ func get_arcname(loc, dest, home string) (arcname string) {
}
func ParseCopyInstruction(spec string) (ans []*CopyInstruction, err error) {
args, err := shlex.Split(spec)
args, err := shlex.Split("copy " + spec)
if err != nil {
return nil, err
}

31
tools/cmd/ssh/config_test.go
View File

@ -20,8 +20,8 @@ func TestSSHConfigParsing(t *testing.T) {
username := ""
conf := ""
for_python := false
cf := filepath.Join(tdir, "ssh.conf")
rt := func(expected_env ...string) {
cf := filepath.Join(tdir, "ssh.conf")
os.WriteFile(cf, []byte(conf), 0o600)
c, err := load_config(hostname, username, nil, cf)
if err != nil {
@ -73,4 +73,33 @@ func TestSSHConfigParsing(t *testing.T) {
rt(`export ["a"]`)
conf = "env a"
rt(`unset ["a"]`)
ci, err := ParseCopyInstruction("--exclude moose --dest=target " + cf)
if err != nil {
t.Fatal(err)
}
diff := cmp.Diff("home/target", ci[0].arcname)
if diff != "" {
t.Fatalf("Incorrect arcname:\n%s", diff)
}
diff = cmp.Diff(cf, ci[0].local_path)
if diff != "" {
t.Fatalf("Incorrect local_path:\n%s", diff)
}
diff = cmp.Diff([]string{"moose"}, ci[0].exclude_patterns)
if diff != "" {
t.Fatalf("Incorrect excludes:\n%s", diff)
}
ci, err = ParseCopyInstruction("--glob " + filepath.Join(filepath.Dir(cf), "*.conf"))
if err != nil {
t.Fatal(err)
}
diff = cmp.Diff(cf, ci[0].local_path)
if diff != "" {
t.Fatalf("Incorrect local_path:\n%s", diff)
}
if len(ci) != 1 {
t.Fatal(ci)
}
}