aboutsummaryrefslogtreecommitdiff
path: root/util/ci
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2021-01-23 23:48:22 +0000
committersfan5 <sfan5@live.de>2021-03-01 12:12:52 +0100
commitccdaf5de54108990fcdeb0b0ff4a4fc4cd998522 (patch)
treecfb2eb5b560bcdc955df7e618e25b828924ea927 /util/ci
parentb390bd2ea5c40cb96af1699a6a18f59dcdb1495b (diff)
downloadminetest-ccdaf5de54108990fcdeb0b0ff4a4fc4cd998522.tar.gz
minetest-ccdaf5de54108990fcdeb0b0ff4a4fc4cd998522.tar.bz2
minetest-ccdaf5de54108990fcdeb0b0ff4a4fc4cd998522.zip
Disable clang-format, clean up scripts
Diffstat (limited to 'util/ci')
-rwxr-xr-xutil/ci/clang-format.sh (renamed from util/ci/lint.sh)25
1 files changed, 23 insertions, 2 deletions
diff --git a/util/ci/lint.sh b/util/ci/clang-format.sh
index 395445ca7..89576c656 100755
--- a/util/ci/lint.sh
+++ b/util/ci/clang-format.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-function perform_lint() {
- echo "Performing LINT..."
+
+function setup_for_format() {
if [ -z "${CLANG_FORMAT}" ]; then
CLANG_FORMAT=clang-format
fi
@@ -8,6 +8,12 @@ function perform_lint() {
CLANG_FORMAT_WHITELIST="util/ci/clang-format-whitelist.txt"
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
+}
+
+function check_format() {
+ echo "Checking format..."
+
+ setup_for_format
local errorcount=0
local fail=0
@@ -41,3 +47,18 @@ function perform_lint() {
echo "LINT OK"
}
+
+
+function fix_format() {
+ echo "Fixing format..."
+
+ setup_for_format
+
+ for f in ${files_to_lint}; do
+ whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
+ if [ -z "${whitelisted}" ]; then
+ echo "$f"
+ $CLANG_FORMAT -i "$f"
+ fi
+ done
+}