Skip to content

Windows color #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Windows color #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a1204
use go-isatty since ssh/terminal is bigger
mattn Sep 10, 2016
044828d
wrap with go-colorable on windows
mattn Sep 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import (
"strconv"
"strings"

"golang.org/x/crypto/ssh/terminal"
"github.com/mattn/go-colorable"
"github.com/mattn/go-isatty"
)

type Options struct {
Expand Down Expand Up @@ -714,8 +715,11 @@ func (o *Options) performAutoDetections(patterns []string, targets []string) {
if o.Color == "auto" {
// auto activate colored output only if STDOUT is a terminal
if o.Output == "" {
if runtime.GOOS != "windows" && terminal.IsTerminal(int(os.Stdout.Fd())) {
if isatty.IsTerminal(os.Stdout.Fd()) {
o.Color = "on"
if runtime.GOOS == "windows" {
global.outputFile = colorable.NewColorableStdout()
}
} else {
o.Color = "off"
}
Expand All @@ -725,7 +729,7 @@ func (o *Options) performAutoDetections(patterns []string, targets []string) {
}

if o.GroupByFile {
if !terminal.IsTerminal(int(os.Stdout.Fd())) {
if !isatty.IsTerminal(os.Stdout.Fd()) {
o.GroupByFile = false
}
}
Expand Down
4 changes: 2 additions & 2 deletions sift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"sync"
"time"

"github.com/mattn/go-isatty"
"github.com/svent/go-flags"
"github.com/svent/go-nbreader"
"github.com/svent/sift/gitignore"
"golang.org/x/crypto/ssh/terminal"
)

const (
Expand Down Expand Up @@ -641,7 +641,7 @@ func main() {

if len(args) == 0 {
// check whether there is input on STDIN
if !terminal.IsTerminal(int(os.Stdin.Fd())) {
if !isatty.IsTerminal(os.Stdin.Fd()) {
targets = []string{"-"}
} else {
targets = []string{"."}
Expand Down