From 410c7daffd8ef9c60f7c83d5be5c9d189124bc72 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Fri, 14 Apr 2023 17:20:10 -0400 Subject: [PATCH 1/2] fix: remove CI exception Make Termenv aware of TERMENV_TTY and assume tty using environment variables. Fixes: 1111971edffa ("Don't run OSC queries on CI") --- termenv.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/termenv.go b/termenv.go index 4ceb271..49d79e4 100644 --- a/termenv.go +++ b/termenv.go @@ -2,6 +2,7 @@ package termenv import ( "errors" + "strconv" "github.com/mattn/go-isatty" ) @@ -28,9 +29,16 @@ func (o *Output) isTTY() bool { if o.assumeTTY || o.unsafe { return true } + + // FIXME: should check for its value instead of length if len(o.environ.Getenv("CI")) > 0 { return false } + + if isTty, err := strconv.ParseBool(o.environ.Getenv("TERMENV_TTY")); err == nil { + return isTty + } + if o.TTY() == nil { return false } From 8aac93e50b00cc34b3491b9341d11dcf8a788995 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Wed, 5 Jul 2023 10:23:54 -0400 Subject: [PATCH 2/2] fix: check CI value --- termenv.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/termenv.go b/termenv.go index 49d79e4..b6013c1 100644 --- a/termenv.go +++ b/termenv.go @@ -30,8 +30,7 @@ func (o *Output) isTTY() bool { return true } - // FIXME: should check for its value instead of length - if len(o.environ.Getenv("CI")) > 0 { + if isCI, err := strconv.ParseBool(o.environ.Getenv("CI")); err == nil && isCI { return false }