From 8a0a3acceee804b91afe31022cf0310c01162f73 Mon Sep 17 00:00:00 2001 From: Nathan Franke Date: Thu, 27 Jan 2022 10:34:33 -0600 Subject: simplify formatting scripts, add a clang-tidy script, and run clang-tidy --- misc/scripts/black_format.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'misc/scripts/black_format.sh') diff --git a/misc/scripts/black_format.sh b/misc/scripts/black_format.sh index 2ad9a23832..45d7f9dd2b 100755 --- a/misc/scripts/black_format.sh +++ b/misc/scripts/black_format.sh @@ -6,28 +6,20 @@ set -uo pipefail # Apply black. echo -e "Formatting Python files..." -PY_FILES=$(find \( -path "./.git" \ - -o -path "./thirdparty" \ - \) -prune \ - -o \( -name "SConstruct" \ - -o -name "SCsub" \ - -o -name "*.py" \ - \) -print) +PY_FILES=$(git ls-files '*SConstruct' '*SCsub' '*.py' --exclude='.git/*' --exclude='thirdparty/*') black -l 120 $PY_FILES -git diff --color > patch.patch +diff=$(git diff --color) # If no patch has been generated all is OK, clean up, and exit. -if [ ! -s patch.patch ] ; then +if [ -z "$diff" ] ; then printf "Files in this commit comply with the black style rules.\n" - rm -f patch.patch exit 0 fi # A patch has been created, notify the user, clean up, and exit. printf "\n*** The following differences were found between the code " printf "and the formatting rules:\n\n" -cat patch.patch +echo "$diff" printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i '\n" -rm -f patch.patch exit 1 -- cgit v1.2.3