diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-01-27 22:59:31 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-01-27 23:05:01 -0700 |
| commit | fdd80b98e9419dc0eaaa367f919252420d4f7676 (patch) | |
| tree | 4d428f1a8111f43455a5ee272df73dd13dc25202 | |
| parent | 5b725e3888442777bdb5c0d656238a13414990b3 (diff) | |
make lint: Have the output be a little prettier
| -rw-r--r-- | GNUmakefile | 1 | ||||
| -rwxr-xr-x | build-aux/lint-generic | 16 | ||||
| -rwxr-xr-x | build-aux/lint-h | 10 | ||||
| -rwxr-xr-x | build-aux/lint-unknown | 5 |
4 files changed, 26 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index 7dc3a5e..db7f7fd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -51,6 +51,7 @@ build-aux/sources.mk: $(if $(wildcard .git),FORCE) | sort \ >$@.tmp if ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi + @echo '################################################################################' endif generate: $(generate/files) diff --git a/build-aux/lint-generic b/build-aux/lint-generic index 9f9e0f7..fcc0457 100755 --- a/build-aux/lint-generic +++ b/build-aux/lint-generic @@ -4,16 +4,24 @@ # Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com> # SPDX-License-Identifier: AGPL-3.0-or-later +RED=$(tput setaf 1) +RESET=$(tput sgr0) + +err() { + printf "${RED}%s${RESET}: %s\n" "$1" "$2" >&2 + r=1 +} + r=0 for filename in "$@"; do if ! { [ -f "$filename" ] && ! [ -h "$filename" ]; }; then continue fi if ! grep -E -q 'Copyright \(C\) 202[4-9]((-|, )202[5-9])* Luke T. Shumaker' "$filename"; then - echo "$filename is missing a copyright statement"; r=1 + err "$filename" 'is missing a copyright statement' fi if ! grep -q ' SPDX-License-Identifier[:] ' "$filename"; then - echo "$filename is missing an SPDX-License-Identifier"; r=1 + err "$filename" 'is missing an SPDX-License-Identifier' fi dscname_act=$(./build-aux/get-dscname "$filename") dscname_exp=$(echo "$filename" | sed \ @@ -22,10 +30,10 @@ for filename in "$@"; do -e 's,.*include/,,' \ -e 's/\.wip$//') if [ "$dscname_act" != "$dscname_exp" ] && [ "cmd/$dscname_act" != "$dscname_exp" ]; then - echo "$filename self-identifies as $dscname_act (expected $dscname_exp)"; r=1 + err "$filename" "self-identifies as $dscname_act (expected $dscname_exp)" fi if grep -n --color=auto "$(printf '\\S\t')" "$filename"; then - echo "$filename uses tabs for alignment"; r=1 + err "$filename" 'uses tabs for alignment' fi done exit $r diff --git a/build-aux/lint-h b/build-aux/lint-h index 965d7d8..26ac13d 100755 --- a/build-aux/lint-h +++ b/build-aux/lint-h @@ -4,6 +4,14 @@ # Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com> # SPDX-License-Identifier: AGPL-3.0-or-later +RED=$(tput setaf 1) +RESET=$(tput sgr0) + +err() { + printf "${RED}%s${RESET}: %s\n" "$1" "$2" >&2 + r=1 +} + r=0 for filename in "$@"; do dscname=$(./build-aux/get-dscname "$filename") @@ -13,7 +21,7 @@ for filename in "$@"; do if ! { grep -Fxq "#ifndef ${guard}" "$filename" && grep -Fxq "#define ${guard}" "$filename" && grep -Fxq "#endif /* ${guard} */" "$filename"; }; then - echo "$filename does not have ${guard} guard"; r=1 + err "$filename" "does not have ${guard} guard" fi done exit $r diff --git a/build-aux/lint-unknown b/build-aux/lint-unknown index 59e83c2..3c2e91b 100755 --- a/build-aux/lint-unknown +++ b/build-aux/lint-unknown @@ -4,4 +4,7 @@ # Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com> # SPDX-License-Identifier: AGPL-3.0-or-later -printf "%s: cannot lint unknown file type\n" "$@" >&2 +RED=$(tput setaf 1) +RESET=$(tput sgr0) + +printf "${RED}%s${RESET}: cannot lint unknown file type\n" "$@" >&2 |