From 400a6895566b67d70bcde43dc8a1cc1c7121f87d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 19 Oct 2021 15:31:22 +0200 Subject: Respect NO_COLOR environment variable When color has not been turned on explictly in the configuration file or options, only turn it on if NO_COLOR is not set. --- apt-private/private-cmndline.cc | 3 ++- apt-private/private-output.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 2884dccba..9af241947 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -474,7 +474,8 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/ std::string const binary = flNotDir(Binary); if (binary == "apt" || binary == "apt-config") { - _config->CndSet("Binary::apt::APT::Color", true); + if (getenv("NO_COLOR") == nullptr) + _config->CndSet("Binary::apt::APT::Color", true); _config->CndSet("Binary::apt::APT::Cache::Show::Version", 2); _config->CndSet("Binary::apt::APT::Cache::AllVersions", false); _config->CndSet("Binary::apt::APT::Cache::ShowVirtuals", true); diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index d07ecc0ce..daa6c6aed 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -86,7 +86,7 @@ bool InitOutput(std::basic_streambuf * const out) /*{{{*/ SigWinch(0); } - if(!isatty(1)) + if(!isatty(1) || getenv("NO_COLOR") != nullptr) { _config->Set("APT::Color", "false"); _config->Set("APT::Color::Highlight", ""); -- cgit v1.2.3-70-g09d2