Merge branch '1'

This commit is contained in:
David Peter authored and David Peter committed 2022-09-07 08:47:26 +02:00
commit c4f7bbbd2b
2 files changed
+10 -1

No files matched your search

+1
View File
@@ -2,6 +2,7 @@
## Features
- Disable colorized output in case of `TERM=dumb` or `NO_COLOR=1`, see #542 and #555 (@nabijaczleweli)
## Changes
+9 -1
View File
@@ -1,7 +1,7 @@
use std::fs::File;
use std::path::PathBuf;
use std::process::{Command, Stdio};
use std::{cmp, fmt, io};
use std::{cmp, env, fmt, io};
use anyhow::ensure;
use atty::Stream;
@@ -298,6 +298,14 @@ impl Options {
|| !atty::is(Stream::Stdout)
{
OutputStyleOption::Basic
} else if env::var_os("TERM")
.map(|t| t == "unknown" || t == "dumb")
.unwrap_or(true)
|| env::var_os("NO_COLOR")
.map(|t| !t.is_empty())
.unwrap_or(false)
{
OutputStyleOption::NoColor
} else {
OutputStyleOption::Full
}