fix: display color when NO_COLOR is an empty string (#2767)

This commit is contained in:
Lena 2023-12-02 12:43:55 +01:00 committed by GitHub
parent 748e2a681f
commit 28990bc451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions

View File

@ -4,6 +4,8 @@
## Bugfixes ## Bugfixes
- Fix `NO_COLOR` support, see #2767 (@acuteenvy)
## Other ## Other
- Upgrade to Rust 2021 edition #2748 (@cyqsimon) - Upgrade to Rust 2021 edition #2748 (@cyqsimon)

View File

@ -29,6 +29,10 @@ fn is_truecolor_terminal() -> bool {
.unwrap_or(false) .unwrap_or(false)
} }
pub fn env_no_color() -> bool {
env::var_os("NO_COLOR").is_some_and(|x| !x.is_empty())
}
pub struct App { pub struct App {
pub matches: ArgMatches, pub matches: ArgMatches,
interactive_output: bool, interactive_output: bool,
@ -207,7 +211,7 @@ impl App {
|| match self.matches.get_one::<String>("color").map(|s| s.as_str()) { || match self.matches.get_one::<String>("color").map(|s| s.as_str()) {
Some("always") => true, Some("always") => true,
Some("never") => false, Some("never") => false,
Some("auto") => env::var_os("NO_COLOR").is_none() && self.interactive_output, Some("auto") => !env_no_color() && self.interactive_output,
_ => unreachable!("other values for --color are not allowed"), _ => unreachable!("other values for --color are not allowed"),
}, },
paging_mode, paging_mode,

View File

@ -19,7 +19,7 @@ static VERSION: Lazy<String> = Lazy::new(|| {
}); });
pub fn build_app(interactive_output: bool) -> Command { pub fn build_app(interactive_output: bool) -> Command {
let color_when = if interactive_output && env::var_os("NO_COLOR").is_none() { let color_when = if interactive_output && !crate::app::env_no_color() {
ColorChoice::Auto ColorChoice::Auto
} else { } else {
ColorChoice::Never ColorChoice::Never