From 564352c4a2d12050d7b4c386e972976a24f1f993 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski Date: Mon, 26 Oct 2009 13:21:43 +0100 Subject: makepkg: extend test for hyphen prefixes to pkgbase and all pkgnames Since commit fb97d32, which brought in this test, support for split PKGBUILDs was added, and therefore, all values of pkgname and also pkgbase have to be checked now. Signed-off-by: Cedric Staniewski Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 47b1fd10..7161096e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1140,8 +1140,17 @@ check_sanity() { error "$(gettext "%s is not allowed to be empty.")" "pkgrel" return 1 fi - if [[ ${pkgname:0:1} == "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + + local name + for name in "${pkgname[@]}"; do + if [[ ${name:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + return 1 + fi + done + + if [[ ${pkgbase:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" return 1 fi if [[ $pkgver != ${pkgver//-/} ]]; then -- cgit v1.2.3