From 286e776eda1d4a939f3a33cbbe314ecb782ecbbd Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 1 Jan 2025 22:20:03 +1000 Subject: [PATCH] lint_config: move PACKAGER check into its own function The check for the format of the PACKAGER variable did not align with the rest of the function where it was located. Move to its own function. Signed-off-by: Allan McRae --- scripts/libmakepkg/lint_config/meson.build | 1 + scripts/libmakepkg/lint_config/packager.sh.in | 37 +++++++++++++++++++ scripts/libmakepkg/lint_config/variable.sh.in | 6 --- 3 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 scripts/libmakepkg/lint_config/packager.sh.in diff --git a/scripts/libmakepkg/lint_config/meson.build b/scripts/libmakepkg/lint_config/meson.build index 7783d87a..9bcdad16 100644 --- a/scripts/libmakepkg/lint_config/meson.build +++ b/scripts/libmakepkg/lint_config/meson.build @@ -3,6 +3,7 @@ libmakepkg_module = 'lint_config' sources = [ 'ext.sh.in', 'nproc.sh.in', + 'packager.sh.in', 'paths.sh.in', 'source_date_epoch.sh.in', 'variable.sh.in', diff --git a/scripts/libmakepkg/lint_config/packager.sh.in b/scripts/libmakepkg/lint_config/packager.sh.in new file mode 100644 index 00000000..33931f1b --- /dev/null +++ b/scripts/libmakepkg/lint_config/packager.sh.in @@ -0,0 +1,37 @@ +#!/bin/bash +# +# source_date_epoch.sh - Check that reproducible builds timestamp is valid +# +# Copyright (c) 2018-2025 Pacman Development Team +# +# 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 . +# + +[[ -n $LIBMAKEPKG_LINT_CONFIG_PACKAGER_SH ]] && return +LIBMAKEPKG_LINT_CONFIG_PACKAGER_SH=1 + +MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} + +source "$MAKEPKG_LIBRARY/util/message.sh" + +lint_config_functions+=('lint_packager') + + +lint_packager() { + # pacman relies on this format to extract an email address from PACKAGER for WKD key lookup + local match='^([^<>]+ )?<[^<>]*>$' + if ! [[ $PACKAGER == "Unknown Packager" || $PACKAGER =~ $match ]]; then + warning "$(gettext "PACKAGER should have the format 'Example Name '")" + fi +} diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 293e7020..0a99ef81 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -60,11 +60,5 @@ lint_config_variables() { fi done - # pacman should be able to extract an email address from PACKAGER for WKD key lookup - local match='^([^<>]+ )?<[^<>]*>$' - if ! [[ $PACKAGER == "Unknown Packager" || $PACKAGER =~ $match ]]; then - warning "$(gettext "PACKAGER should have the format 'Example Name '")" - fi - return $ret }