From 519685e4b1cff3df9bc389550fa6e19ee4ba8794 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 4 Sep 2018 15:17:54 -0400 Subject: libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae (cherry picked from commit 2bec380e108536f5e5f728ef66223ed3fabf5ab1) --- scripts/libmakepkg/lint_config/variable.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 14bd0e05..55ed6d6d 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -25,10 +25,10 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" -lint_config_functions+=('lint_variable') +lint_config_functions+=('lint_config_variables') -lint_variable() { +lint_config_variables() { local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ COMPRESSLRZ COMPRESSLZO COMPRESSZ) -- cgit v1.2.3-24-g4f1b