From 4875f3f799b647b94ed2ebb0ee2b253a8f15365f Mon Sep 17 00:00:00 2001 From: Borja Clemente Date: Wed, 24 Mar 2021 15:52:50 +0100 Subject: [PATCH 1/3] Set version command output to Stdout Default command output was set to Stderr, now set to Stdout. Signed-off-by: Borja Clemente --- pkg/commands/version.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/commands/version.go b/pkg/commands/version.go index 3918d6b7b7aa..f7f0345e0533 100644 --- a/pkg/commands/version.go +++ b/pkg/commands/version.go @@ -2,6 +2,7 @@ package commands import ( "encoding/json" + "os" "strings" "github.com/spf13/cobra" @@ -33,6 +34,7 @@ func (e *Executor) initVersion() { Use: "version", Short: "Version", RunE: func(cmd *cobra.Command, _ []string) error { + cmd.SetOut(os.Stdout) switch strings.ToLower(e.cfg.Version.Format) { case "short": cmd.Println(e.version) From 94d8cba871bc189294df94d04633097a4694bb5c Mon Sep 17 00:00:00 2001 From: Borja Clemente Date: Wed, 24 Mar 2021 17:28:49 +0100 Subject: [PATCH 2/3] Replace cmd.Println with fmt.Println Signed-off-by: Borja Clemente --- pkg/commands/version.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/commands/version.go b/pkg/commands/version.go index f7f0345e0533..f6087bed4430 100644 --- a/pkg/commands/version.go +++ b/pkg/commands/version.go @@ -2,7 +2,7 @@ package commands import ( "encoding/json" - "os" + "fmt" "strings" "github.com/spf13/cobra" @@ -34,10 +34,9 @@ func (e *Executor) initVersion() { Use: "version", Short: "Version", RunE: func(cmd *cobra.Command, _ []string) error { - cmd.SetOut(os.Stdout) switch strings.ToLower(e.cfg.Version.Format) { case "short": - cmd.Println(e.version) + fmt.Println(e.version) case "json": ver := jsonVersion{ Version: e.version, @@ -48,7 +47,7 @@ func (e *Executor) initVersion() { if err != nil { return err } - cmd.Println(string(data)) + fmt.Println(string(data)) default: cmd.Printf("golangci-lint has version %s built from %s on %s\n", e.version, e.commit, e.date) } From 21e96558b39819eed26c32bbe77dc45bb2c897d4 Mon Sep 17 00:00:00 2001 From: Borja Clemente Date: Wed, 24 Mar 2021 17:29:47 +0100 Subject: [PATCH 3/3] Replace cmd.Printf with fmt.Printf Signed-off-by: Borja Clemente --- pkg/commands/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/commands/version.go b/pkg/commands/version.go index f6087bed4430..8b48e515bff3 100644 --- a/pkg/commands/version.go +++ b/pkg/commands/version.go @@ -49,7 +49,7 @@ func (e *Executor) initVersion() { } fmt.Println(string(data)) default: - cmd.Printf("golangci-lint has version %s built from %s on %s\n", e.version, e.commit, e.date) + fmt.Printf("golangci-lint has version %s built from %s on %s\n", e.version, e.commit, e.date) } return nil },