From e30f52e59d2fdb578030685c19a60df5774e366e Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 16 Apr 2020 22:06:03 -0400
Subject: Report errors in scripts/clang-tidy-diff.sh if clang-tidy is not
 found (#2775)

---
 scripts/clang-tidy-diff.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'scripts/clang-tidy-diff.sh')

diff --git a/scripts/clang-tidy-diff.sh b/scripts/clang-tidy-diff.sh
index 5f3495504..c3f3cc4a2 100755
--- a/scripts/clang-tidy-diff.sh
+++ b/scripts/clang-tidy-diff.sh
@@ -15,11 +15,20 @@ else
   BRANCH=origin/master
 fi
 
-CLANG_DIR=$(dirname $(dirname $(which clang-tidy)))
+CLANG_TIDY=$(which clang-tidy)
+if [ ! -e "$CLANG_TIDY" ]; then
+  echo "Failed to find clang-tidy ($CLANG_TIDY)"
+  exit 1
+fi
+
+CLANG_DIR=$(dirname $(dirname $CLANG_TIDY))
 CLANG_TIDY_DIFF=$CLANG_DIR/share/clang/clang-tidy-diff.py
+if [ ! -e "$CLANG_TIDY_DIFF" ]; then
+  echo "Failed to find clang-tidy-diff.py ($CLANG_TIDY_DIFF)"
+  exit 1
+fi
 TIDY_MSG=$(git diff -U0 $BRANCH... | $CLANG_TIDY_DIFF -quiet -p1 2> /dev/null)
-if [ -n "$TIDY_MSG" -a "$TIDY_MSG" != "No relevant changes found." ]
-then
+if [ -n "$TIDY_MSG" -a "$TIDY_MSG" != "No relevant changes found." ]; then
   echo "Please fix clang-tidy errors before committing"
   echo
   # Run clang-tidy once again to show the error
-- 
cgit v1.2.3