Skip to content

Commit 401188f

Browse files
authored
Fix color output on Windows (#220)
1 parent 01bd237 commit 401188f

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

cmd/kubectx/main.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@ import (
88
"github.com/ahmetb/kubectx/internal/cmdutil"
99
"github.com/ahmetb/kubectx/internal/env"
1010
"github.com/ahmetb/kubectx/internal/printer"
11+
"github.com/fatih/color"
1112
)
1213

1314
type Op interface {
1415
Run(stdout, stderr io.Writer) error
1516
}
1617

1718
func main() {
18-
cmdutil.PrintDeprecatedEnvWarnings(os.Stderr, os.Environ())
19+
cmdutil.PrintDeprecatedEnvWarnings(color.Error, os.Environ())
1920

2021
op := parseArgs(os.Args[1:])
21-
if err := op.Run(os.Stdout, os.Stderr); err != nil {
22-
printer.Error(os.Stderr, err.Error())
22+
if err := op.Run(color.Output, color.Error); err != nil {
23+
printer.Error(color.Error, err.Error())
2324

2425
if _, ok := os.LookupEnv(env.EnvDebug); ok {
2526
// print stack trace in verbose mode
26-
fmt.Fprintf(os.Stderr, "[DEBUG] error: %+v\n", err)
27+
fmt.Fprintf(color.Error, "[DEBUG] error: %+v\n", err)
2728
}
2829
defer os.Exit(1)
2930
}

cmd/kubens/main.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ import (
88
"github.com/ahmetb/kubectx/internal/cmdutil"
99
"github.com/ahmetb/kubectx/internal/env"
1010
"github.com/ahmetb/kubectx/internal/printer"
11+
"github.com/fatih/color"
1112
)
1213

1314
type Op interface {
1415
Run(stdout, stderr io.Writer) error
1516
}
1617

1718
func main() {
18-
cmdutil.PrintDeprecatedEnvWarnings(os.Stderr, os.Environ())
19+
cmdutil.PrintDeprecatedEnvWarnings(color.Error, os.Environ())
1920
op := parseArgs(os.Args[1:])
20-
if err := op.Run(os.Stdout, os.Stderr); err != nil {
21-
printer.Error(os.Stderr, err.Error())
21+
if err := op.Run(color.Output, color.Error); err != nil {
22+
printer.Error(color.Error, err.Error())
2223

2324
if _, ok := os.LookupEnv(env.EnvDebug); ok {
2425
// print stack trace in verbose mode
25-
fmt.Fprintf(os.Stderr, "[DEBUG] error: %+v\n", err)
26+
fmt.Fprintf(color.Error, "[DEBUG] error: %+v\n", err)
2627
}
2728
defer os.Exit(1)
2829
}

0 commit comments

Comments
 (0)