From b9ff03c805ead01101f214638873fcdcb3124a02 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 18 Feb 2022 16:23:33 +0000 Subject: [PATCH] build: fix clang-format-diff[.py] detection 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 Change-Id: I3cb76aa152a8245e62db62f5fe2ba96b1ff86428 --- extras/scripts/checkstyle.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh index 4dcf77874d3..f26dc234690 100755 --- a/extras/scripts/checkstyle.sh +++ b/extras/scripts/checkstyle.sh @@ -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 "*******************************************************************" -- 2.16.6