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

kitty @ shell: Fix global options being ignored

Browse Source 
Also no need to exec a separate process for every command
This commit is contained in:
Kovid Goyal
2023-02-04 12:54:49 +05:30
parent 0cabc3e109
commit 9bdb647454
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/cli/command.go
View File

@@ -520,28 +520,24 @@ func (self *Command) GetOptionValues(pointer_to_options_struct any) error {
return nil
}
func (self *Command) Exec(args ...string) {
func (self *Command) ExecArgs(args []string) (exit_code int) {
root := self
for root.Parent != nil {
root = root.Parent
}
if len(args) == 0 {
args = os.Args
}
cmd, err := root.ParseArgs(args)
if err != nil {
ShowError(err)
os.Exit(1)
return 1
}
help_opt := cmd.option_map["Help"]
version_opt := root.option_map["Version"]
exit_code := 0
if help_opt != nil && help_opt.parsed_value().(bool) {
cmd.ShowHelp()
os.Exit(exit_code)
return
} else if version_opt != nil && version_opt.parsed_value().(bool) {
root.ShowVersion()
os.Exit(exit_code)
return
} else if cmd.Run != nil {
exit_code, err = cmd.Run(cmd, cmd.Args)
if err != nil {
@@ -551,7 +547,14 @@ func (self *Command) Exec(args ...string) {
}
}
}
os.Exit(exit_code)
return
}
func (self *Command) Exec(args ...string) {
if len(args) == 0 {
args = os.Args
}
os.Exit(self.ExecArgs(args))
}
func (self *Command) GetCompletions(argv []string, init_completions func(*Completions)) *Completions {