Skip to content

Commit bba8c04

Browse files
fix(cli): open EDITOR correctly
resolves #6019
1 parent b4d0b42 commit bba8c04

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/cli/edit.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ func editFileWithEditor(file string) int {
1414
return 1
1515
}
1616

17-
var args []string
18-
if strings.Contains(editor, " ") {
19-
strs := strings.Split(editor, " ")
20-
editor = strs[0]
21-
args = strs[1:]
22-
}
17+
editor = strings.TrimSpace(editor)
18+
args := strings.Split(editor, " ")
19+
20+
editor = args[0]
21+
args = append(args[1:], file)
2322

24-
args = append(args, file)
2523
cmd := exec.Command(editor, args...)
2624

27-
err := cmd.Run()
28-
if err != nil {
25+
cmd.Stdin = os.Stdin
26+
cmd.Stdout = os.Stdout
27+
cmd.Stderr = os.Stderr
28+
29+
if err := cmd.Run(); err != nil {
2930
fmt.Println(err.Error())
3031
return 1
3132
}
3233

33-
return cmd.ProcessState.ExitCode()
34+
return 0
3435
}

0 commit comments

Comments
 (0)