Add support for NO_COLOR env var (sharkdp#1021)

eth-p · May 27, 2020 · 96b92a8 · 96b92a8
1 parent 6f88ba0
commit 96b92a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/bin/bat/app.rs b/src/bin/bat/app.rs
@@ -165,7 +165,7 @@ impl App {
             colored_output: match self.matches.value_of("color") {
                 Some("always") => true,
                 Some("never") => false,
-                Some("auto") | _ => self.interactive_output,
+                Some("auto") | _ => env::var_os("NO_COLOR").is_none() && self.interactive_output,
             },
             paging_mode,
             term_width: maybe_term_width.unwrap_or(Term::stdout().size().1 as usize),

diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs
@@ -1,8 +1,9 @@
 use clap::{crate_name, crate_version, App as ClapApp, AppSettings, Arg, ArgGroup, SubCommand};
+use std::env;
 use std::path::Path;
 
 pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
-    let clap_color_setting = if interactive_output {
+    let clap_color_setting = if interactive_output && env::var_os("NO_COLOR").is_none() {
         AppSettings::ColoredHelp
     } else {
         AppSettings::ColorNever