Use xcbeautify if present

Author: groue

Makefile

@@ -1,7 +1,14 @@
-XCPRETTY_PATH := $(shell command -v xcpretty 2> /dev/null)
-XCPRETTY = 
-ifdef XCPRETTY_PATH
-  XCPRETTY = | xcpretty -c
+  # If xcbeautify or xcpretty is available, use it for xcodebuild output, except in CI.
+XCPRETTY =
+ifeq ($(CI),true)
+else
+  XCBEAUTIFY_PATH := $(shell command -v xcbeautify 2> /dev/null)
+  XCPRETTY_PATH := $(shell command -v xcpretty 2> /dev/null)
+  ifdef XCBEAUTIFY_PATH
+    XCPRETTY = | xcbeautify
+  else ifdef XCPRETTY_PATH
+    XCPRETTY = | xcpretty -c
+  endif
 endif
 
 test: