CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-09-16 09:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow using defer in KittenMain

Browse source
This commit is contained in:
Kovid Goyal 2025-09-30 11:20:37 +05:30
parent ca0ff68d8e
commit ba96fa06fe
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/cli/command.go
View file

@ -565,13 +565,6 @@ func (self *Command) ExecArgs(args []string) (exit_code int) {
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 {
ans := NewCompletions()
if init_completions != nil {

9
tools/cmd/main.go
View file

@ -16,13 +16,12 @@ import (
"golang.org/x/sys/unix"
)
func KittenMain(args ...string) {
func KittenMain(args ...string) int {
krm := os.Getenv("KITTY_KITTEN_RUN_MODULE")
os.Unsetenv("KITTY_KITTEN_RUN_MODULE")
switch krm {
case "ssh_askpass":
ssh.RunSSHAskpass()
return
return ssh.RunSSHAskpass()
}
root := cli.NewRootCommand()
root.ShortDescription = "Fast, statically compiled implementations of various kittens (command line tools for use with kitty)"
@ -49,9 +48,9 @@ func KittenMain(args ...string) {
completion.EntryPoint(root)
root.SubCommandIsOptional = true
root.Exec(args...)
return root.ExecArgs(args)
}
func main() {
KittenMain()
os.Exit(KittenMain())
}