diff --git a/cli/main.go b/cli/main.go index ba011e36..7f5f43da 100644 --- a/cli/main.go +++ b/cli/main.go @@ -5,6 +5,7 @@ import ( "os" "strings" + "github.com/spf13/cobra" "golang.org/x/exp/slog" ) @@ -28,10 +29,11 @@ func main() { err := rootCmd.Execute() var codeErr codeError if errors.As(err, &codeErr) { - rootCmd.PrintErrf("keyconjurer: %s\n", codeErr.Error()) + cobra.CheckErr(codeErr) os.Exit(int(codeErr.Code())) } else if err != nil { - rootCmd.PrintErrf("keyconjurer: %s\n", err.Error()) + // Probably a cobra error. + cobra.CheckErr(err) os.Exit(ExitCodeUnknownError) } } diff --git a/cli/root.go b/cli/root.go index 14522f67..07838e85 100644 --- a/cli/root.go +++ b/cli/root.go @@ -102,4 +102,5 @@ To get started run the following commands: return config.Write(file) }, SilenceErrors: true, + SilenceUsage: true, }