From 9302593cfb8a5a845dab501cfaef71ea5d54933a Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 12 May 2015 23:46:36 +1000 Subject: makepkg: merge validate_pkgver into check_pkgver The check that pkgver is non-empty done in check_pkgver should also be performed after running the pkgver() function. Merge validate_pkgver into check_pkgver and run check_pkgver after updating pkgver. Signed-off-by: Allan McRae --- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 12 ++++-------- scripts/makepkg.sh.in | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index d23f7043..3fa4ff7d 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -29,20 +29,16 @@ source "$LIBRARY/util/message.sh" lint_pkgbuild_functions+=('lint_pkgver') -validate_pkgver() { - if [[ $1 = *[[:space:]:-]* ]]; then - error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" - return 1 - fi -} - check_pkgver() { if [[ -z ${pkgver} ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgver" return 1 fi - validate_pkgver "$pkgver" + if [[ $1 = *[[:space:]:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" + return 1 + fi } lint_pkgver() { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4885341c..11e64593 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -824,7 +824,7 @@ download_sources() { # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver update_pkgver() { newpkgver=$(run_function_safe pkgver) - if ! validate_pkgver "$newpkgver"; then + if ! check_pkgver "$newpkgver"; then error "$(gettext "pkgver() generated an invalid version: %s")" "$newpkgver" exit 1 fi -- cgit v1.2.3-70-g09d2