build: fix clang-format-diff[.py] detection 97/35397/4
authorKlement Sekera <klement.sekera@gmail.com>
Fri, 18 Feb 2022 16:23:33 +0000 (16:23 +0000)
committerDave Wallace <dwallacelf@gmail.com>
Tue, 22 Mar 2022 01:34:57 +0000 (01:34 +0000)
Fix clang-format-diff autodetection error in case of non-standard
clang-format-diff path. Also allow finding clang-format-diff.py in
non-standard location.

Type: improvement
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
Change-Id: I3cb76aa152a8245e62db62f5fe2ba96b1ff86428

extras/scripts/checkstyle.sh

index 4dcf778..f26dc23 100755 (executable)
@@ -60,9 +60,12 @@ fi
 if command -v clang-format-diff${SUFFIX} &> /dev/null;
 then
     CLANG_FORMAT_DIFF=clang-format-diff${SUFFIX}
+elif command -v clang-format-diff.py &> /dev/null;
+then
+    CLANG_FORMAT_DIFF=clang-format-diff.py
 elif command -v clang-format-diff &> /dev/null;
 then
-    CLANG_FORMAT=clang-format-diff
+    CLANG_FORMAT_DIFF=clang-format-diff
 elif [ ! -f $CLANG_FORMAT_DIFF ] ;
 then
     echo "*******************************************************************"