Change tty detection library

hashicorp · Aug 23, 2017 · 717bf7f · 717bf7f
1 parent 44ebb0e
commit 717bf7f
Show file tree

Hide file tree

Showing 19 changed files with 1,441 additions and 225 deletions.
diff --git a/command/meta.go b/command/meta.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/nomad/api"
-	isatty "github.com/mattn/go-isatty"
 	"github.com/mitchellh/cli"
 	"github.com/mitchellh/colorstring"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 const (
@@ -127,7 +127,7 @@ func (m *Meta) Client() (*api.Client, error) {
 func (m *Meta) Colorize() *colorstring.Colorize {
 	return &colorstring.Colorize{
 		Colors:  colorstring.DefaultColors,
-		Disable: m.noColor || !isatty.IsTerminal(os.Stdout.Fd()),
+		Disable: m.noColor || !terminal.IsTerminal(int(os.Stdout.Fd())),
 		Reset:   true,
 	}
 }

diff --git a/vendor/github.com/mattn/go-isatty/LICENSE b/vendor/github.com/mattn/go-isatty/LICENSE
diff --git a/vendor/github.com/mattn/go-isatty/README.md b/vendor/github.com/mattn/go-isatty/README.md
diff --git a/vendor/github.com/mattn/go-isatty/doc.go b/vendor/github.com/mattn/go-isatty/doc.go
diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
diff --git a/vendor/github.com/mattn/go-isatty/isatty_linux.go b/vendor/github.com/mattn/go-isatty/isatty_linux.go
diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go
diff --git a/vendor/github.com/mattn/go-isatty/isatty_solaris.go b/vendor/github.com/mattn/go-isatty/isatty_solaris.go
diff --git a/vendor/github.com/mattn/go-isatty/isatty_windows.go b/vendor/github.com/mattn/go-isatty/isatty_windows.go
diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE
diff --git a/vendor/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS