system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-06 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: honor CLICOLOR_FORCE= variable to enable colors with nmcli

Browse source 
Note that [1] suggests to also accept an empty value as having the variable
set. That is likely a bug ([2]) in the documentation, makes little sense, and
is not the case with NO_COLOR ([3]).

[1] https://bixense.com/clicolors/
[2] https://github.com/jhasse/clicolors/issues/13
[3] https://no-color.org/
This commit is contained in:
Thomas Haller 2023-09-14 15:24:58 +02:00 committed by Beniamino Galvani
parent 0ac5221c40
commit ae06a607b3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
man/nmcli.xml
View file

@ -130,7 +130,8 @@
Please refer to the <link linkend='colors' endterm='colors.title' /> section for a
list of color names supported by <command>nmcli</command>.</para>
<para>If the environment variable <literal>NO_COLOR</literal> is set (to any non-empty value),
then coloring is disabled with mode "auto". Explicitly enabling coloring overrides
then coloring is disabled with mode "auto". If the environment variable <literal>CLICOLOR_FORCE</literal>
is set (to any non-empty value), then coloring is enabled with mode "auto". Explicitly enabling coloring overrides
the environment variable.</para>
</listitem>
</varlistentry>

4
src/nmcli/nmcli.c
View file

@ -489,7 +489,9 @@ check_colors(NmcColorOption color_option, char **out_palette_str)
term = g_getenv("TERM");
if (color_option == NMC_USE_COLOR_AUTO) {
if (nm_streq0(term, "dumb") || !isatty(STDOUT_FILENO))
if (nm_str_not_empty(g_getenv("CLICOLOR_FORCE"))) {
color_option = NMC_USE_COLOR_YES;
} else if (nm_streq0(term, "dumb") || !isatty(STDOUT_FILENO))
return FALSE;
}