From 132240507d0ab2999e764537b181e89ecc3c2b0e Mon Sep 17 00:00:00 2001 From: наб Date: Fri, 21 May 2021 23:43:38 +0200 Subject: Turn shellcheck into a normal make target. Fix new files it caught MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This checks every file it checked (and a few more), but explicitly instead of "if it works it works" best-effort (which wasn't that good anyway) Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #10512 Closes #12101 --- Makefile.am | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 689816bdc..4fd3f9b3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/config/Shellcheck.am + ACLOCAL_AMFLAGS = -I config SUBDIRS = include @@ -123,17 +125,8 @@ cstyle: filter_executable = -exec test -x '{}' \; -print -PHONY += shellcheck -shellcheck: - @if type shellcheck > /dev/null 2>&1; then \ - shellcheck --exclude=SC1090,SC1117,SC1091 --format=gcc \ - $$(find ${top_srcdir} -name "config*" -prune -name tests -prune \ - -o -name "*.sh" -o -name "*.sh.in" -type f) \ - $$(find ${top_srcdir}/cmd/zpool/zpool.d/* \ - -type f ${filter_executable}); \ - else \ - echo "skipping shellcheck because shellcheck is not installed"; \ - fi +SHELLCHECKDIRS = cmd contrib etc scripts tests +SHELLCHECKSCRIPTS = autogen.sh PHONY += checkabi storeabi checkabi: lib -- cgit v1.2.3