Merge pull request #6 from serpent-os/no-color-if-no-tty

Don't color output if stdin is no TTY
serpent-os · Apr 11, 2023 · c423724 · c423724
2 parents 54c98b6 + d82087a
commit c423724
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/container/container/container/container/source/main.d b/container/container/container/container/source/main.d
@@ -19,7 +19,7 @@ import core.stdc.stdlib : _Exit;
 import core.sys.linux.sched;
 import core.sys.posix.sys.stat : umask;
 import core.sys.posix.sys.wait;
-import core.sys.posix.unistd : fork, geteuid;
+import core.sys.posix.unistd : fork, geteuid, isatty;
 import moss.container;
 import moss.container.context;
 import moss.core.mounts;
@@ -94,7 +94,14 @@ public struct ContainerCLI
     @CommandEntry() int run(ref string[] args)
     {
         /// FIXME: make configurable (-d is currently used for destination)
-        configureLogger(ColorLoggerFlags.Color | ColorLoggerFlags.Timestamps);
+        if (isatty(0) && isatty(1))
+        {
+            configureLogger(ColorLoggerFlags.Color | ColorLoggerFlags.Timestamps);
+        }
+        else
+        {
+            configureLogger(ColorLoggerFlags.Timestamps);
+        }
         globalLogLevel = LogLevel.trace;
 
         umask(octal!22);