diff --git a/scripts/libmakepkg/lint_config/meson.build b/scripts/libmakepkg/lint_config/meson.build index 2262ad45..7783d87a 100644 --- a/scripts/libmakepkg/lint_config/meson.build +++ b/scripts/libmakepkg/lint_config/meson.build @@ -2,6 +2,7 @@ libmakepkg_module = 'lint_config' sources = [ 'ext.sh.in', + 'nproc.sh.in', 'paths.sh.in', 'source_date_epoch.sh.in', 'variable.sh.in', diff --git a/scripts/libmakepkg/lint_config/nproc.sh.in b/scripts/libmakepkg/lint_config/nproc.sh.in new file mode 100644 index 00000000..44cf403c --- /dev/null +++ b/scripts/libmakepkg/lint_config/nproc.sh.in @@ -0,0 +1,40 @@ +#!/bin/bash +# +# nproc.sh - Check that NPROC setting is valid +# +# Copyright (c) 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_NPROC_SH ]] && return +LIBMAKEPKG_LINT_CONFIG_NPROC_SH=1 + +MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} + +source "$MAKEPKG_LIBRARY/util/message.sh" + +lint_config_functions+=('lint_nproc') + + +lint_nproc() { + # provide default value if NPROC is not set + [[ -z $NPROC ]] && NPROC=1 + + if [[ $NPROC = *[^[:digit:]]* ]]; then + error "$(gettext "%s contains invalid characters: %s")" \ + "\$NPROC" "${NPROC//[[:digit:]]}" + return 1 + fi +} diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 0ba45b45..293e7020 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -66,8 +66,5 @@ lint_config_variables() { warning "$(gettext "PACKAGER should have the format 'Example Name '")" fi - # provide default value if NPROC is not set - [[ -z $NPROC ]] && NPROC=1 - return $ret }