github/kubectx
1
0
Fork 0
mirror of https://github.com/ahmetb/kubectx.git synced 2025-06-01 20:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix color output on Windows (#220)

Browse Source
This commit is contained in:
Jason Harmon 2020-05-15 18:26:00 -04:00 committed by GitHub
parent 01bd237baa
commit 401188fefd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubectx/main.go
View File

@ -8,6 +8,7 @@ import (
"github.com/ahmetb/kubectx/internal/cmdutil" "github.com/ahmetb/kubectx/internal/cmdutil"
"github.com/ahmetb/kubectx/internal/env" "github.com/ahmetb/kubectx/internal/env"
"github.com/ahmetb/kubectx/internal/printer" "github.com/ahmetb/kubectx/internal/printer"
"github.com/fatih/color"
) )
type Op interface { type Op interface {
@ -15,15 +16,15 @@ type Op interface {
} }
func main() { func main() {
cmdutil.PrintDeprecatedEnvWarnings(os.Stderr, os.Environ()) cmdutil.PrintDeprecatedEnvWarnings(color.Error, os.Environ())
op := parseArgs(os.Args[1:]) op := parseArgs(os.Args[1:])
if err := op.Run(os.Stdout, os.Stderr); err != nil { if err := op.Run(color.Output, color.Error); err != nil {
printer.Error(os.Stderr, err.Error()) printer.Error(color.Error, err.Error())
if _, ok := os.LookupEnv(env.EnvDebug); ok { if _, ok := os.LookupEnv(env.EnvDebug); ok {
// print stack trace in verbose mode // 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) defer os.Exit(1)
} }

9
cmd/kubens/main.go
View File

@ -8,6 +8,7 @@ import (
"github.com/ahmetb/kubectx/internal/cmdutil" "github.com/ahmetb/kubectx/internal/cmdutil"
"github.com/ahmetb/kubectx/internal/env" "github.com/ahmetb/kubectx/internal/env"
"github.com/ahmetb/kubectx/internal/printer" "github.com/ahmetb/kubectx/internal/printer"
"github.com/fatih/color"
) )
type Op interface { type Op interface {
@ -15,14 +16,14 @@ type Op interface {
} }
func main() { func main() {
cmdutil.PrintDeprecatedEnvWarnings(os.Stderr, os.Environ()) cmdutil.PrintDeprecatedEnvWarnings(color.Error, os.Environ())
op := parseArgs(os.Args[1:]) op := parseArgs(os.Args[1:])
if err := op.Run(os.Stdout, os.Stderr); err != nil { if err := op.Run(color.Output, color.Error); err != nil {
printer.Error(os.Stderr, err.Error()) printer.Error(color.Error, err.Error())
if _, ok := os.LookupEnv(env.EnvDebug); ok { if _, ok := os.LookupEnv(env.EnvDebug); ok {
// print stack trace in verbose mode // 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) defer os.Exit(1)
} }