From 86db12d02d60dcd834fe0763fd41241a52ca98b7 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Wed, 6 Nov 2019 08:02:55 -0800 Subject: [PATCH] change tty detection library to what syncthing uses --- feta.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/feta.go b/feta.go index f52749c..257198a 100644 --- a/feta.go +++ b/feta.go @@ -8,7 +8,7 @@ import _ "github.com/jinzhu/gorm/dialects/sqlite" import "github.com/rs/zerolog" import "github.com/rs/zerolog/log" -import "golang.org/x/crypto/ssh/terminal" +import "github.com/mattn/go-isatty" type InstanceHostname string @@ -48,7 +48,9 @@ func (f *FetaProcess) setupLogging() { log.Logger = log.With().Caller().Logger() - if terminal.IsTerminal(int(os.Stdout.Fd())) { + tty := isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd()) + + if tty { out := zerolog.NewConsoleWriter( func(w *zerolog.ConsoleWriter) { // Customize time format