Update our tooling (Clang 5 -> 7, GCC 7 -> 8)

[dragonfireclient.git] / util / travis / lint.sh

diff --git a/util/travis/lint.sh b/util/travis/lint.sh
index c1df2d5fa5310795bd44660a71627b71fbe8d9db..b3027c689efca3d66e9235d4a6a061a4e15cbdd9 100644 (file)
--- a/util/travis/lint.sh
+++ b/util/travis/lint.sh
@@ -1,20 +1,13 @@
 #! /bin/bash
 function perform_lint() {
        echo "Performing LINT..."
-       if hash clang-format-3.9 2>/dev/null; then
-               CLANG_FORMAT=clang-format-3.9
-       else
+       if [ -z "${CLANG_FORMAT}" ]; then
                CLANG_FORMAT=clang-format
        fi
+       echo "LINT: Using binary $CLANG_FORMAT"
        CLANG_FORMAT_WHITELIST="util/travis/clang-format-whitelist.txt"
 
-       if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
-               # Get list of every file modified in this pull request
-               files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' | true)"
-       else
-               # Check everything for branch pushes
-               files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
-       fi
+       files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
 
        local errorcount=0
        local fail=0
@@ -22,10 +15,10 @@ function perform_lint() {
                d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true)
 
                if ! [ -z "$d" ]; then
-                       whitelisted=$(egrep -c "^${f}" "${CLANG_FORMAT_WHITELIST}")
+                       whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
 
                        # If file is not whitelisted, mark a failure
-                       if [ ${whitelisted} -eq 0 ]; then
+                       if [ -z "${whitelisted}" ]; then
                                errorcount=$((errorcount+1))
 
                                printf "The file %s is not compliant with the coding style" "$f"