Enable log colors for most of tools in /usr/bin

keszybz · keszybz · commit 1a04395959ca · 2019-05-08T09:50:21.000+02:00
When emitting the calendarspec warning we want to see some color. Follow-up for 04220fd. Exceptions: - systemctl, because it has a lot hand-crafted coloring - tmpfiles, sysusers, stdio-bridge, etc, because they are also used in services and I'm not sure if this wouldn't mess up something.
diff --git a/src/activate/activate.c b/src/activate/activate.c
@@ -474,6 +474,7 @@ int main(int argc, char **argv, char **envp) {
         int r, n;
         int epoll_fd = -1;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
@@ -2104,6 +2104,7 @@ static int run(int argc, char *argv[]) {
         setlocale(LC_ALL, "");
         setlocale(LC_NUMERIC, "C"); /* we want to format/parse floats in C style */
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
@@ -158,6 +158,7 @@ static int run(int argc, char *argv[]) {
         char **p;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
@@ -2508,6 +2508,7 @@ static int busctl_main(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
@@ -165,6 +165,7 @@ static void show_cg_info(const char *controller, const char *path) {
 static int run(int argc, char *argv[]) {
         int r, output_flags;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
@@ -909,6 +909,7 @@ static int run(int argc, char *argv[]) {
         CGroupMask mask;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
@@ -1069,6 +1069,7 @@ static int run(int argc, char *argv[]) {
         int r, units_active;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/delta/delta.c b/src/delta/delta.c
@@ -639,6 +639,7 @@ static int parse_argv(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r, k, n_found = 0;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
@@ -128,6 +128,7 @@ static int run(int argc, char *argv[]) {
          * to detect whether we are being run in a virtualized
          * environment or not */
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/escape/escape.c b/src/escape/escape.c
@@ -159,6 +159,7 @@ static int run(int argc, char *argv[]) {
         char **i;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
@@ -432,6 +432,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/id128/id128.c b/src/id128/id128.c
@@ -155,6 +155,7 @@ static int id128_main(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/journal/cat.c b/src/journal/cat.c
@@ -127,6 +127,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_close_ int outfd = -1, errfd = -1, saved_stderr = -1;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
@@ -2100,6 +2100,7 @@ int main(int argc, char *argv[]) {
         int n_shown = 0, r, poll_fd = -1;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
@@ -510,6 +510,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
@@ -270,6 +270,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
@@ -1529,6 +1529,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
@@ -3100,6 +3100,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
@@ -1525,6 +1525,7 @@ static int run(int argc, char* argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
@@ -1128,6 +1128,7 @@ static void warn_networkd_missing(void) {
 static int run(int argc, char* argv[]) {
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/notify/notify.c b/src/notify/notify.c
@@ -151,6 +151,7 @@ static int run(int argc, char* argv[]) {
         unsigned i = 0;
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/path/path.c b/src/path/path.c
@@ -171,6 +171,7 @@ static int parse_argv(int argc, char *argv[]) {
 static int run(int argc, char* argv[]) {
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
@@ -956,6 +956,7 @@ static int run(int argc, char *argv[]) {
 
         int r;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
@@ -3137,6 +3137,7 @@ static int run(int argc, char **argv) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/run/run.c b/src/run/run.c
@@ -1652,6 +1652,7 @@ static int run(int argc, char* argv[]) {
         _cleanup_free_ char *description = NULL;
         int r, retval = EXIT_SUCCESS;
 
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
@@ -866,6 +866,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();
 
