bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lint_config: move PACKAGER check into its own function

Browse source 
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 <allan@archlinux.org>
This commit is contained in:
Allan McRae 2025-01-01 22:20:03 +10:00
parent cc87999d6d
commit 286e776eda
3 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/libmakepkg/lint_config/meson.build
View file

@ -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',

37
scripts/libmakepkg/lint_config/packager.sh.in Normal file
View file

@ -0,0 +1,37 @@
#!/bin/bash
#
# source_date_epoch.sh - Check that reproducible builds timestamp is valid
#
# Copyright (c) 2018-2025 Pacman Development Team <pacman-dev@lists.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_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 <email@address.invalid>'")"
fi
}

6
scripts/libmakepkg/lint_config/variable.sh.in
View file

@ -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 <email@address.invalid>'")"
fi
return $ret
}