From d708b178f049839bfdbaf0289e400363eac78a30 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Fri, 23 Dec 2016 02:04:10 -0800
Subject: Don't error if uncrustify is not present (Mac images). Don't colorize
 if stdout isn't a terminal.

---
 etc/uncrustify_check.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/uncrustify_check.sh b/etc/uncrustify_check.sh
index fc299650..aed05f61 100755
--- a/etc/uncrustify_check.sh
+++ b/etc/uncrustify_check.sh
@@ -18,6 +18,12 @@ mydir=`dirname $0`
 srcdir=${mydir}/../src
 failed=
 
+uncrustify --version > /dev/null
+if [ $? -ne 0 ]; then
+	echo "Uncrustify not found.  Skipping checks."
+	exit 0
+fi
+
 for file in `find ${srcdir} -name '*.[ch]' -print`
 do
 	uncrustify -c "${mydir}/uncrustify.cfg" -q -lC $file
@@ -25,7 +31,11 @@ do
 		echo "Cannot run uncrustify??" 1>&2
 		exit 2
 	fi
-	colordiff -u $file $file.uncrustify
+	if [ -t 1 ]; then
+		colordiff -u $file $file.uncrustify
+	else
+		diff -u $file $file.uncrustify
+	fi
 	if [ $? -ne 0 ]; then
 		failed=1
 	fi
-- 
cgit v1.2.3-70-g09d2