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

misc fixes

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-16 21:40:40 +05:30
parent 20ad7ca437
commit 780b5ca8bd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bypy/macos.conf
View File

@ -1,4 +1,4 @@
# Requires installation of XCode 10.3 and Python 3 and # Requires installation of XCode 10.3 and go 1.19 and Python 3 and
# python3 -m pip install certifi # python3 -m pip install certifi
vm_name 'macos-kitty' vm_name 'macos-kitty'

11
tools/cli/infrastructure.go
View File

@ -267,6 +267,8 @@ func show_usage(cmd *cobra.Command) error {
idx := strings.Index(use, " ") idx := strings.Index(use, " ")
if idx > -1 { if idx > -1 {
use = use[idx+1:] use = use[idx+1:]
} else {
use = ""
} }
fmt.Fprintln(&output, title_fmt("Usage")+":", exe_fmt(full_command_name(cmd)), use) fmt.Fprintln(&output, title_fmt("Usage")+":", exe_fmt(full_command_name(cmd)), use)
fmt.Fprintln(&output) fmt.Fprintln(&output)
@ -279,6 +281,9 @@ func show_usage(cmd *cobra.Command) error {
fmt.Fprintln(&output) fmt.Fprintln(&output)
fmt.Fprintln(&output, title_fmt("Commands")+":") fmt.Fprintln(&output, title_fmt("Commands")+":")
for _, child := range cmd.Commands() { for _, child := range cmd.Commands() {
if child.Hidden {
continue
}
fmt.Fprintln(&output, " ", opt_fmt(child.Name())) fmt.Fprintln(&output, " ", opt_fmt(child.Name()))
format_with_indent(&output, child.Short, " ", screen_width) format_with_indent(&output, child.Short, " ", screen_width)
} }
@ -350,8 +355,11 @@ func CreateCommand(cmd *cobra.Command) *cobra.Command {
if cmd.Run == nil && cmd.RunE == nil { if cmd.Run == nil && cmd.RunE == nil {
cmd.RunE = func(cmd *cobra.Command, args []string) error { cmd.RunE = func(cmd *cobra.Command, args []string) error {
if len(cmd.Commands()) > 0 { if len(cmd.Commands()) > 0 {
if len(args) == 0 {
return fmt.Errorf("%s. Use %s -h to get a list of available sub-commands", err_fmt("No sub-command specified"), full_command_name(cmd)) return fmt.Errorf("%s. Use %s -h to get a list of available sub-commands", err_fmt("No sub-command specified"), full_command_name(cmd))
} }
return fmt.Errorf("Not a valid subcommand: %s. Use %s -h to get a list of available sub-commands", err_fmt(args[0]), full_command_name(cmd))
}
return nil return nil
} }
} }
@ -372,7 +380,9 @@ func CreateCommand(cmd *cobra.Command) *cobra.Command {
} }
func show_help(cmd *cobra.Command, args []string) { func show_help(cmd *cobra.Command, args []string) {
if cmd.Annotations != nil {
cmd.Annotations["use-pager-for-usage"] = "true" cmd.Annotations["use-pager-for-usage"] = "true"
}
show_usage(cmd) show_usage(cmd)
} }
@ -386,4 +396,5 @@ func Init(root *cobra.Command) {
root.Version = vs root.Version = vs
root.SetUsageFunc(show_usage) root.SetUsageFunc(show_usage)
root.SetHelpFunc(show_help) root.SetHelpFunc(show_help)
root.SetHelpCommand(&cobra.Command{Hidden: true})
} }