From 33ff4870dcbcb742db58eacd3a006247dd85a363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 5 May 2024 20:14:10 +0800 Subject: [PATCH] Fastfetch: enable pipe mode if `$NO_COLOR` is set --- src/logo/logo.c | 2 +- src/options/display.c | 2 +- src/util/textModifier.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/logo/logo.c b/src/logo/logo.c index 97015d237..c78926339 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -61,7 +61,7 @@ void ffLogoPrintChars(const char* data, bool doColorReplacement) FF_STRBUF_AUTO_DESTROY result = ffStrbufCreateA(2048); - if (instance.config.display.brightColor) + if (!instance.config.display.pipe && instance.config.display.brightColor) ffStrbufAppendS(&result, FASTFETCH_TEXT_MODIFIER_BOLT); ffStrbufAppendNC(&result, options->paddingTop, '\n'); diff --git a/src/options/display.c b/src/options/display.c index f5683fc21..22a018867 100644 --- a/src/options/display.c +++ b/src/options/display.c @@ -350,7 +350,7 @@ void ffOptionsInitDisplay(FFOptionsDisplay* options) ffStrbufInitStatic(&options->keyValueSeparator, ": "); options->showErrors = false; - options->pipe = !isatty(STDOUT_FILENO); + options->pipe = !isatty(STDOUT_FILENO) || !!getenv("NO_COLOR"); #ifdef NDEBUG options->disableLinewrap = !options->pipe; diff --git a/src/util/textModifier.h b/src/util/textModifier.h index f282d31d5..3ff9db082 100644 --- a/src/util/textModifier.h +++ b/src/util/textModifier.h @@ -5,6 +5,6 @@ #define FASTFETCH_TEXT_MODIFIER_BOLT "\033[1m" #define FASTFETCH_TEXT_MODIFIER_ERROR "\033[1;31m" -#define FASTFETCH_TEXT_MODIFIER_RESET "\033[0m" +#define FASTFETCH_TEXT_MODIFIER_RESET "\033[m" #endif