From 401188fefd4fa3dcd94ee6a8eb1bb1efbff04b25 Mon Sep 17 00:00:00 2001 From: Jason Harmon Date: Fri, 15 May 2020 18:26:00 -0400 Subject: [PATCH] Fix color output on Windows (#220) --- cmd/kubectx/main.go | 9 +++++---- cmd/kubens/main.go | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/kubectx/main.go b/cmd/kubectx/main.go index 8da7b39..938134e 100644 --- a/cmd/kubectx/main.go +++ b/cmd/kubectx/main.go @@ -8,6 +8,7 @@ import ( "github.com/ahmetb/kubectx/internal/cmdutil" "github.com/ahmetb/kubectx/internal/env" "github.com/ahmetb/kubectx/internal/printer" + "github.com/fatih/color" ) type Op interface { @@ -15,15 +16,15 @@ type Op interface { } func main() { - cmdutil.PrintDeprecatedEnvWarnings(os.Stderr, os.Environ()) + cmdutil.PrintDeprecatedEnvWarnings(color.Error, os.Environ()) op := parseArgs(os.Args[1:]) - if err := op.Run(os.Stdout, os.Stderr); err != nil { - printer.Error(os.Stderr, err.Error()) + if err := op.Run(color.Output, color.Error); err != nil { + printer.Error(color.Error, err.Error()) if _, ok := os.LookupEnv(env.EnvDebug); ok { // print stack trace in verbose mode - fmt.Fprintf(os.Stderr, "[DEBUG] error: %+v\n", err) + fmt.Fprintf(color.Error, "[DEBUG] error: %+v\n", err) } defer os.Exit(1) } diff --git a/cmd/kubens/main.go b/cmd/kubens/main.go index f3e895f..8a1cd2a 100644 --- a/cmd/kubens/main.go +++ b/cmd/kubens/main.go @@ -8,6 +8,7 @@ import ( "github.com/ahmetb/kubectx/internal/cmdutil" "github.com/ahmetb/kubectx/internal/env" "github.com/ahmetb/kubectx/internal/printer" + "github.com/fatih/color" ) type Op interface { @@ -15,14 +16,14 @@ type Op interface { } func main() { - cmdutil.PrintDeprecatedEnvWarnings(os.Stderr, os.Environ()) + cmdutil.PrintDeprecatedEnvWarnings(color.Error, os.Environ()) op := parseArgs(os.Args[1:]) - if err := op.Run(os.Stdout, os.Stderr); err != nil { - printer.Error(os.Stderr, err.Error()) + if err := op.Run(color.Output, color.Error); err != nil { + printer.Error(color.Error, err.Error()) if _, ok := os.LookupEnv(env.EnvDebug); ok { // print stack trace in verbose mode - fmt.Fprintf(os.Stderr, "[DEBUG] error: %+v\n", err) + fmt.Fprintf(color.Error, "[DEBUG] error: %+v\n", err) } defer os.Exit(1) }