proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-09 06:12:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Respect the NO_COLOR env variable

Browse Source 
Fixes half of https://github.com/fwupd/fwupd/issues/4503
This commit is contained in:
Richard Hughes 2022-04-08 09:07:54 +01:00
parent 47381ba54a
commit df9ed97d9d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fu-debug.c
View File

@ -101,6 +101,16 @@ fu_debug_handler_cb(const gchar *log_domain,
return; return;
} }
/* plain output */
if (g_getenv("NO_COLOR") != NULL) {
if (timestamp != NULL)
g_printerr("%s ", timestamp);
if (domain != NULL)
g_printerr("%s ", domain->str);
g_printerr("%s\n", message);
return;
}
/* to screen */ /* to screen */
switch (log_level) { switch (log_level) {
case G_LOG_LEVEL_ERROR: case G_LOG_LEVEL_ERROR:

20
src/fu-util-common.c
View File

@ -49,6 +49,8 @@ fu_util_get_systemd_unit(void)
gchar * gchar *
fu_util_term_format(const gchar *text, FuUtilTermColor fg_color) fu_util_term_format(const gchar *text, FuUtilTermColor fg_color)
{ {
if (g_getenv("NO_COLOR") != NULL)
return g_strdup(text);
return g_strdup_printf("\033[%um\033[1m%s\033[0m", fg_color, text); return g_strdup_printf("\033[%um\033[1m%s\033[0m", fg_color, text);
} }
@ -2066,17 +2068,17 @@ fu_security_attr_append_str(FwupdSecurityAttr *attr,
for (guint i = fu_common_strwidth(name); i < 30; i++) for (guint i = fu_common_strwidth(name); i < 30; i++)
g_string_append(str, " "); g_string_append(str, " ");
if (fwupd_security_attr_has_flag(attr, FWUPD_SECURITY_ATTR_FLAG_OBSOLETED)) { if (fwupd_security_attr_has_flag(attr, FWUPD_SECURITY_ATTR_FLAG_OBSOLETED)) {
g_string_append_printf(str, g_autofree gchar *fmt = fu_util_term_format(fu_security_attr_get_result(attr),
"\033[37m\033[1m%s\033[0m", FU_UTIL_TERM_COLOR_YELLOW);
fu_security_attr_get_result(attr)); g_string_append(str, fmt);
} else if (fwupd_security_attr_has_flag(attr, FWUPD_SECURITY_ATTR_FLAG_SUCCESS)) { } else if (fwupd_security_attr_has_flag(attr, FWUPD_SECURITY_ATTR_FLAG_SUCCESS)) {
g_string_append_printf(str, g_autofree gchar *fmt = fu_util_term_format(fu_security_attr_get_result(attr),
"\033[32m\033[1m%s\033[0m", FU_UTIL_TERM_COLOR_GREEN);
fu_security_attr_get_result(attr)); g_string_append(str, fmt);
} else { } else {
g_string_append_printf(str, g_autofree gchar *fmt =
"\033[31m\033[1m%s\033[0m", fu_util_term_format(fu_security_attr_get_result(attr), FU_UTIL_TERM_COLOR_RED);
fu_security_attr_get_result(attr)); g_string_append(str, fmt);
} }
if ((flags & FU_SECURITY_ATTR_TO_STRING_FLAG_SHOW_URLS) > 0 && if ((flags & FU_SECURITY_ATTR_TO_STRING_FLAG_SHOW_URLS) > 0 &&
fwupd_security_attr_get_url(attr) != NULL) { fwupd_security_attr_get_url(attr) != NULL) {