fix: display color when NO_COLOR is an empty string

sharkdp · Nov 4, 2023 · 4c74925 · 4c74925
1 parent 8bbbd76
commit 4c74925
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ## Bugfixes
 
+- Fix `NO_COLOR` support, see #1421 (@acuteenvy)
+
 ## Changes
 
 - The default number of threads is now constrained to be at most 16. This should improve startup time on

diff --git a/src/main.rs b/src/main.rs
@@ -218,12 +218,12 @@ fn construct_config(mut opts: Opts, pattern_regexps: &[String]) -> Result<Config
     let ansi_colors_support = true;
 
     let interactive_terminal = std::io::stdout().is_terminal();
+    let no_color = env::var_os("NO_COLOR").is_some_and(|x| !x.is_empty());
+
     let colored_output = match opts.color {
         ColorWhen::Always => true,
         ColorWhen::Never => false,
-        ColorWhen::Auto => {
-            ansi_colors_support && env::var_os("NO_COLOR").is_none() && interactive_terminal
-        }
+        ColorWhen::Auto => ansi_colors_support && !no_color && interactive_terminal,
     };
 
     let ls_colors = if colored_output {