More simplified

HaxeFoundation · Aug 30, 2024 · 5d60aba · 5d60aba
1 parent 7a2291b
commit 5d60aba
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/tools/hxcpp/Log.hx b/tools/hxcpp/Log.hx
@@ -129,7 +129,6 @@ class Log
       if (colorSupported == null)
       {
          var term = Sys.getEnv("TERM");
-         var colorTerm = Sys.getEnv("COLORTERM");
 
          if (term == "dumb")
          {
@@ -159,32 +158,21 @@ class Log
                   }
                }
 
-               if (colorSupported != true)
+               if (colorSupported != true && Sys.getEnv("CI_NAME") == "codeship")
                {
-                  if (Sys.getEnv("CI_NAME") == "codeship")
-                  {
-                     colorSupported = true;
-                  }
+                  colorSupported = true;
                }
             }
 
-            if (colorSupported != true)
+            if (colorSupported != true && Sys.getEnv("TEAMCITY_VERSION") != null)
             {
-               if (Sys.getEnv("TEAMCITY_VERSION") != null)
-               {
-                  colorSupported = ~/^9\.(0*[1-9]\d*)\.|\d{2,}\./.match(Sys.getEnv("TEAMCITY_VERSION"));
-               }
-               else if (colorTerm == "truecolor")
-               {
-                  colorSupported = true;
-               }
+               colorSupported = ~/^9\.(0*[1-9]\d*)\.|\d{2,}\./.match(Sys.getEnv("TEAMCITY_VERSION"));
             }
 
-            if (colorSupported != true)
+            if (colorSupported != true && term != null)
             {
                colorSupported = ~/(?i)-256(color)?$/.match(term)
-                  || ~/(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/.match(term)
-                  || (colorTerm != null);
+                  || ~/(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/.match(term);
             }
 
             if (colorSupported != true)