Variables such as 'pkgdesc_x86_64' are invalid, instead of ignoring them raise an error. This also disallows using 'any' as an architecture specific variable Signed-off-by: morganamilo <morganamilo@gmail.com> --- v5: "libmakepkg: disallow using any as an architecture specific variable" was squashed into this commit. Move this lint to its own file. v6: Fixups and rebase against master scripts/Makefile.am | 1 + .../lint_pkgbuild/arch_specific.sh.in | 82 +++++++++++++++++++ scripts/libmakepkg/lint_pkgbuild/meson.build | 1 + 3 files changed, 84 insertions(+) create mode 100644 scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f84fda1d..7fffd93b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -80,6 +80,7 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_package/missing_backup.sh \ libmakepkg/lint_pkgbuild.sh \ libmakepkg/lint_pkgbuild/arch.sh \ + libmakepkg/lint_pkgbuild/arch_specific.sh \ libmakepkg/lint_pkgbuild/backup.sh \ libmakepkg/lint_pkgbuild/changelog.sh \ libmakepkg/lint_pkgbuild/checkdepends.sh \ diff --git a/scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in new file mode 100644 index 00000000..25627dd9 --- /dev/null +++ b/scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in @@ -0,0 +1,82 @@ +#!/bin/bash +# +# arch_specific.sh - Check that arch specific variables can be arch specific. +# +# Copyright (c) 2014-2018 Pacman Development Team <pacman-dev@archlinux.org> +# +# 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_PKGBUILD_ARCH_SPECIFIC_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_ARCH_SPECIFIC_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" +source "$LIBRARY/util/schema.sh" +source "$LIBRARY/util/util.sh" + + +lint_pkgbuild_functions+=('lint_arch_specific') + + +lint_arch_specific() { + local i a pkg ret=0 + + # global variables + for a in ${arch[@]}; do + if [[ $a == "any" ]]; then + for i in ${pkgbuild_schema_arch_arrays[@]}; do + if declare -p "${i}_${a}" > /dev/null 2>&1; then + error "$(gettext "Can not provide architecture specific variables for the '%s' architecture: %s")" "any" "${i}_${a}" + ret=1 + fi + done + fi + + for i in ${pkgbuild_schema_arrays[@]} ${pkgbuild_schema_strings[@]}; do + in_array "$i" ${pkgbuild_schema_arch_arrays[@]} && continue + v="${i}_${a}" + if declare -p "$v" > /dev/null 2>&1; then + error "$(gettext "%s can not be architecture specific: %s")" "$i" "${i}_${a}" + ret=1 + fi + done + done + + # package function variables + for pkg in ${pkgname[@]}; do + for a in ${arch[@]}; do + if [[ $a == "any" ]]; then + for i in ${pkgbuild_schema_arch_arrays[@]}; do + if exists_function_variable "package_$pkg" "${i}_${a}"; then + error "$(gettext "Can not provide architecture specific variables for the '%s' architecture: %s")" "any" "${i}_${a}" + ret=1 + fi + done + fi + + for i in ${pkgbuild_schema_arrays[@]} ${pkgbuild_schema_strings[@]}; do + in_array "$i" ${pkgbuild_schema_arch_arrays[@]} && continue + if exists_function_variable "package_$pkg" "${i}_${a}"; then + error "$(gettext "%s can not be architecture specific: %s")" "$i" "${i}_${a}" + ret=1 + fi + done + done + done + + return $ret +} diff --git a/scripts/libmakepkg/lint_pkgbuild/meson.build b/scripts/libmakepkg/lint_pkgbuild/meson.build index f699a8e2..6050df2f 100644 --- a/scripts/libmakepkg/lint_pkgbuild/meson.build +++ b/scripts/libmakepkg/lint_pkgbuild/meson.build @@ -2,6 +2,7 @@ libmakepkg_module = 'lint_pkgbuild' sources = [ 'arch.sh.in', + 'arch_specific.sh.in', 'backup.sh.in', 'changelog.sh.in', 'checkdepends.sh.in', -- 2.20.1