From 4b1617c4ef8afdabc5ffd22e27019997003a1b8b Mon Sep 17 00:00:00 2001 From: Bryan McNulty Date: Fri, 18 Apr 2025 04:15:48 -0500 Subject: changed metavars for global flags --- cmd/root.go | 6 +++--- cmd/tsch.go | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'cmd') diff --git a/cmd/root.go b/cmd/root.go index 815730e..5e2a66d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -146,7 +146,7 @@ func init() { modules := &cobra.Group{ ID: "module", - Title: "Execution Modules:", + Title: "Execution Commands:", } rootCmd.AddGroup(modules) @@ -156,7 +156,7 @@ func init() { logOpts.BoolVar(&logDebug, "debug", false, "Enable debug logging") logOpts.BoolVar(&logJson, "json", false, "Write logging output in JSON lines") logOpts.BoolVar(&logQuiet, "quiet", false, "Disable info logging") - logOpts.StringVarP(&logOutput, "log-file", "O", "", "Write JSON logging output to file") + logOpts.StringVarP(&logOutput, "log-file", "O", "", "Write JSON logging output to `file`") rootCmd.PersistentFlags().AddFlagSet(logOpts) flagGroups["Logging"] = logOpts } @@ -164,7 +164,7 @@ func init() { // Global networking flags { netOpts := pflag.NewFlagSet("Network", pflag.ExitOnError) - netOpts.StringVarP(&proxy, "proxy", "x", "", "Proxy URL") + netOpts.StringVarP(&proxy, "proxy", "x", "", "Proxy `URI`") rootCmd.PersistentFlags().AddFlagSet(netOpts) } diff --git a/cmd/tsch.go b/cmd/tsch.go index 0ed5d9f..2cece94 100644 --- a/cmd/tsch.go +++ b/cmd/tsch.go @@ -49,12 +49,11 @@ func argsTask(*cobra.Command, []string) error { case tschTask == "": tschTask = `\` + util.RandomString() case tschexec.ValidateTaskPath(tschTask) == nil: + return nil case tschexec.ValidateTaskName(tschTask) == nil: tschTask = `\` + tschTask - default: - return fmt.Errorf("invalid task name or path: %q", tschTask) } - return nil + return fmt.Errorf("invalid task name or path: %q", tschTask) } var ( -- cgit v1.2.3