kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-09-20 02:57:19 +03:00
Code Issues Projects Releases Wiki Activity

Better error message for kitty shell when running unknown command

Browse Source
This commit is contained in:
Kovid Goyal 2022-11-16 20:53:08 +05:30
parent a4e43b3925
commit bdd04f37d6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/cmd/at/shell.go
View File

@ -113,7 +113,7 @@ func show_basic_help() {
cli.ShowHelpInPager(output.String())
}
func exec_command(rl *readline.Readline, cmdline string) bool {
func exec_command(at_root_command *cli.Command, rl *readline.Readline, cmdline string) bool {
parsed_cmdline, err := shlex.Split(cmdline)
if err != nil {
fmt.Fprintln(os.Stderr, "Could not parse cmdline:", err)
@ -142,17 +142,21 @@ func exec_command(rl *readline.Readline, cmdline string) bool {
case "help":
fmt.Println("Show help")
default:
r := EntryPoint(cli.NewRootCommand())
sc := r.FindSubCommand(parsed_cmdline[1])
sc := at_root_command.FindSubCommand(parsed_cmdline[1])
if sc == nil {
hi.ExitCode = 1
fmt.Fprintln(os.Stderr, "No command named", formatter.BrightRed(parsed_cmdline[1]), ". Type help for a list of commands")
fmt.Fprintln(os.Stderr, "No command named", formatter.BrightRed(parsed_cmdline[1])+". Type help for a list of commands")
} else {
sc.ShowHelpWithCommandString(sc.Name)
}
}
return true
default:
if at_root_command.FindSubCommand(parsed_cmdline[0]) == nil {
hi.ExitCode = 1
fmt.Fprintln(os.Stderr, "No command named", formatter.BrightRed(parsed_cmdline[0])+". Type help for a list of commands")
return true
}
exe, err := os.Executable()
if err != nil {
exe, err = exec.LookPath("kitty-tool")
@ -217,7 +221,7 @@ func shell_main(cmd *cli.Command, args []string) (int, error) {
if err == ErrExec {
cmdline := rl.AllText()
cmdline = strings.ReplaceAll(cmdline, "\\\n", "")
if !exec_command(rl, cmdline) {
if !exec_command(cmd, rl, cmdline) {
return 0, nil
}
continue