mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-12 11:39:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use cobra's builtin machinery for creating new types

Browse Source
This commit is contained in:
Kovid Goyal
2022-08-17 12:35:14 +05:30
parent a0bff4abab
commit 6c25f0cf4b
3 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/cmd/at/main.go
View File

@@ -152,7 +152,8 @@ var command_objects map[string]*cobra.Command = make(map[string]*cobra.Command)
func EntryPoint(tool_root *cobra.Command) *cobra.Command {
var at_root_command *cobra.Command
var to, password, password_file, password_env, use_password *string
var to, password, password_file, password_env *string
var use_password *cli.ChoicesVal
at_root_command = cli.CreateCommand(&cobra.Command{
Use: "@ [global options] command [command options] [command args]",
Short: "Control kitty remotely",
@@ -163,7 +164,7 @@ func EntryPoint(tool_root *cobra.Command) *cobra.Command {
global_options.to_address_is_from_env_var = true
}
global_options.to_address = *to
q, err := get_password(*password, *password_file, *password_env, *use_password)
q, err := get_password(*password, *password_file, *password_env, use_password.Choice)
global_options.password = q
return err
},
@@ -192,7 +193,7 @@ func EntryPoint(tool_root *cobra.Command) *cobra.Command {
"The name of an environment variable to read the password from."+
" Used if no :option:`--password-file` or :option:`--password` is supplied.")
use_password = cli.PersistentChoices(at_root_command, "use-password", "If no password is available, kitty will usually just send the remote control command without a password. This option can be used to force it to always or never use the supplied password.", "if-available", "always", "never")
use_password = cli.Choices(at_root_command.PersistentFlags(), "use-password", "If no password is available, kitty will usually just send the remote control command without a password. This option can be used to force it to always or never use the supplied password.", "if-available", "always", "never")
for cmd_name, reg_func := range all_commands {
c := reg_func(at_root_command)

3
tools/cmd/main.go
View File

@@ -1,7 +1,6 @@
package main
import (
"fmt"
"os"
"github.com/spf13/cobra"
@@ -19,7 +18,7 @@ func main() {
cli.Init(root)
if err := root.Execute(); err != nil {
fmt.Fprintln(os.Stderr, "Error:", err)
cli.PrintError(err)
os.Exit(1)
}
}