diff --git a/commands/commands.go b/commands/commands.go index 204377a..b65641f 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -11,17 +11,13 @@ import ( type runEFunc func(cmd *cobra.Command, _ []string) error -func WithPrettyLogging( - f func(cmd *cobra.Command, args []string) error, -) func(cmd *cobra.Command, args []string) error { - return func(cmd *cobra.Command, args []string) error { - err := SetupZerolog(cmd) - if err != nil { - return err - } - - return f(cmd, args) +func PersistentPreRunE(cmd *cobra.Command, _ []string) error { + err := SetupZerolog(cmd) + if err != nil { + return err } + + return nil } func SetupZerolog(cmd *cobra.Command) error { diff --git a/commands/config.go b/commands/config.go index 7b24d70..28ce64d 100644 --- a/commands/config.go +++ b/commands/config.go @@ -11,7 +11,7 @@ func NewConfig(mgr *manager.Manager) (*cobra.Command, error) { Short: "Show evm environment/setup details", Aliases: []string{"env", "info"}, ValidArgs: []string{}, - RunE: WithPrettyLogging(configRunE(mgr)), + RunE: configRunE(mgr), } cmd.Flags().StringP("format", "f", "", "output format (yaml or json)") diff --git a/commands/evm.go b/commands/evm.go index bb67f1a..c8d4794 100644 --- a/commands/evm.go +++ b/commands/evm.go @@ -7,8 +7,10 @@ import ( func NewEvm(mgr *manager.Manager) (*cobra.Command, error) { cmd := &cobra.Command{ - Use: "evm", - Short: "A simple and opinionated Emacs Version Manager and build tool", + Use: "evm", + Short: "A simple and opinionated Emacs Version Manager " + + "and build tool", + PersistentPreRunE: PersistentPreRunE, } cmd.PersistentFlags().StringP( diff --git a/commands/exec.go b/commands/exec.go index 6d925b0..1c26dc6 100644 --- a/commands/exec.go +++ b/commands/exec.go @@ -22,7 +22,7 @@ func NewExec(mgr *manager.Manager) (*cobra.Command, error) { DisableFlagsInUseLine: true, Hidden: true, ValidArgsFunction: execValidArgs(mgr), - RunE: WithPrettyLogging(execRunE(mgr)), + RunE: execRunE(mgr), } return cmd, nil diff --git a/commands/list.go b/commands/list.go index 796496c..36f5aab 100644 --- a/commands/list.go +++ b/commands/list.go @@ -15,7 +15,7 @@ func NewList(mgr *manager.Manager) (*cobra.Command, error) { Aliases: []string{"ls", "versions"}, Args: cobra.ExactArgs(0), ValidArgsFunction: noValidArgs, - RunE: WithPrettyLogging(listRunE(mgr)), + RunE: listRunE(mgr), } cmd.Flags().StringP("format", "f", "", "output format (yaml or json)") diff --git a/commands/rehash.go b/commands/rehash.go index 377cd86..3312022 100644 --- a/commands/rehash.go +++ b/commands/rehash.go @@ -13,7 +13,7 @@ func NewRehash(mgr *manager.Manager) (*cobra.Command, error) { Short: "Update shims for all or specific versions", Aliases: []string{"reshim"}, ValidArgsFunction: rehashValidArgs(mgr), - RunE: WithPrettyLogging(rehashRunE(mgr)), + RunE: rehashRunE(mgr), } return cmd, nil diff --git a/commands/use.go b/commands/use.go index ed3874c..defd96b 100644 --- a/commands/use.go +++ b/commands/use.go @@ -14,7 +14,7 @@ func NewUse(mgr *manager.Manager) (*cobra.Command, error) { Aliases: []string{"activate", "switch"}, Args: cobra.ExactArgs(1), ValidArgsFunction: useValidArgs(mgr), - RunE: WithPrettyLogging(useRunE(mgr)), + RunE: useRunE(mgr), } return cmd, nil