On 08/02/18 14:44, Eli Schwartz wrote: > Currently the only things we check are: > > - Things that should be arrays, are not strings, and vice versa (this > was mostly copy-pasted from the similar code in lint_pkgbuild). > - Variables that are meant to contain pathname components cannot contain > a newline character, because newline characters in pathnames are weird > and also don't play well with future changes intended for the > --packagelist option. > > Signed-off-by: Eli Schwartz <[email protected]> > --- > scripts/Makefile.am | 4 ++ > scripts/libmakepkg/lint_config.sh.in | 48 ++++++++++++++++++++ > scripts/libmakepkg/lint_config/paths.sh.in | 47 ++++++++++++++++++++ > scripts/libmakepkg/lint_config/variable.sh.in | 64 > +++++++++++++++++++++++++++ > scripts/makepkg.sh.in | 4 ++ > 5 files changed, 167 insertions(+) > create mode 100755 scripts/libmakepkg/lint_config.sh.in > create mode 100644 scripts/libmakepkg/lint_config/paths.sh.in > create mode 100644 scripts/libmakepkg/lint_config/variable.sh.in > > diff --git a/scripts/Makefile.am b/scripts/Makefile.am > index 8cf79f21..90593984 100644 > --- a/scripts/Makefile.am > +++ b/scripts/Makefile.am > @@ -44,6 +44,7 @@ libmakepkgdir = $(datarootdir)/makepkg > > LIBMAKEPKGDIRS = \ > integrity \ > + lint_config \ > lint_package \ > lint_pkgbuild \ > source \ > @@ -56,6 +57,9 @@ LIBMAKEPKG_IN = \ > libmakepkg/integrity/generate_signature.sh \ > libmakepkg/integrity/verify_checksum.sh \ > libmakepkg/integrity/verify_signature.sh \ > + libmakepkg/lint_config.sh \ > + libmakepkg/lint_config/paths.sh \ > + libmakepkg/lint_config/variables.sh \ > libmakepkg/lint_package.sh \ > libmakepkg/lint_package/build_references.sh \ > libmakepkg/lint_package/dotfiles.sh \ > diff --git a/scripts/libmakepkg/lint_config.sh.in > b/scripts/libmakepkg/lint_config.sh.in > new file mode 100755 > index 00000000..b383a910 > --- /dev/null > +++ b/scripts/libmakepkg/lint_config.sh.in > @@ -0,0 +1,48 @@ > +#!/usr/bin/bash > +# > +# lint_config.sh - functions for checking for makepkg.conf errors > +# > +# Copyright (c) 2018 Pacman Development Team <[email protected]> > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > +# > + > +[[ -n "$LIBMAKEPKG_LINT_CONFIG_SH" ]] && return > +LIBMAKEPKG_LINT_CONFIG_SH=1 > + > +LIBRARY=${LIBRARY:-'/usr/share/makepkg'} > + > +source "$LIBRARY/util/message.sh" > +source "$LIBRARY/util/util.sh" > + > + > +declare -a lint_config_functions > + > +for lib in "$LIBRARY/lint_config/"*.sh; do > + source "$lib" > +done > + > +readonly -a lint_config_functions > + > + > +lint_package() {
lint_config() which makes me suspect this is not tested... (rest of patch looks fine though) A
