diff --git a/systeroid-core/src/config.rs b/systeroid-core/src/config.rs index b605914..d0494a7 100644 --- a/systeroid-core/src/config.rs +++ b/systeroid-core/src/config.rs @@ -21,8 +21,6 @@ pub struct Config { pub ignore_errors: bool, /// Whether if the quiet mode is enabled. pub quiet: bool, - /// Whether if the colors are disabled. - pub no_color: bool, /// Whether if the pager is disabled. pub no_pager: bool, /// Sections and the corresponding colors. @@ -39,7 +37,6 @@ impl Default for Config { verbose: false, ignore_errors: false, quiet: false, - no_color: false, no_pager: false, section_colors: map! { Section::Abi => Color::Red, diff --git a/systeroid-core/src/sysctl/parameter.rs b/systeroid-core/src/sysctl/parameter.rs index c1cc86b..ec3910e 100644 --- a/systeroid-core/src/sysctl/parameter.rs +++ b/systeroid-core/src/sysctl/parameter.rs @@ -75,41 +75,24 @@ impl Parameter { /// Prints the kernel parameter to given output. pub fn display_value(&self, config: &Config, output: &mut W) -> Result<()> { - if !config.no_color { - match config.display_type { - DisplayType::Name => { - writeln!(output, "{}", self.colored_name(config))?; - } - DisplayType::Value => { - writeln!(output, "{}", self.value.bold())?; - } - DisplayType::Binary => { - write!(output, "{}", self.value.bold())?; - } - DisplayType::Default => { - writeln!( - output, - "{} {} {}", - self.colored_name(config), - "=".color(config.default_color), - self.value.bold(), - )?; - } + match config.display_type { + DisplayType::Name => { + writeln!(output, "{}", self.colored_name(config))?; } - } else { - match config.display_type { - DisplayType::Name => { - writeln!(output, "{}", self.name)?; - } - DisplayType::Value => { - writeln!(output, "{}", self.value)?; - } - DisplayType::Binary => { - write!(output, "{}", self.value)?; - } - DisplayType::Default => { - writeln!(output, "{} = {}", self.name, self.value)?; - } + DisplayType::Value => { + writeln!(output, "{}", self.value.bold())?; + } + DisplayType::Binary => { + write!(output, "{}", self.value.bold())?; + } + DisplayType::Default => { + writeln!( + output, + "{} {} {}", + self.colored_name(config), + "=".color(config.default_color), + self.value.bold(), + )?; } } Ok(()) diff --git a/systeroid/src/lib.rs b/systeroid/src/lib.rs index 3a3a491..c1da161 100644 --- a/systeroid/src/lib.rs +++ b/systeroid/src/lib.rs @@ -9,7 +9,6 @@ pub mod args; use crate::app::App; use crate::args::Args; -use std::env; use systeroid_core::config::Config; use systeroid_core::error::Result; use systeroid_core::sysctl::controller::Sysctl; @@ -22,7 +21,6 @@ pub fn run(args: Args) -> Result<()> { quiet: args.quiet, no_pager: args.no_pager, display_type: args.display_type, - no_color: env::var("NO_COLOR").is_ok(), ..Default::default() }; let mut sysctl = Sysctl::init(config)?;