From cd042640c66e73f3fe4f5299a36e4cca5384b34b Mon Sep 17 00:00:00 2001 From: Andres P Date: Thu, 17 Jun 2010 08:14:46 -0430 Subject: makepkg: less code repetition for empty variable checking Signed-off-by: Andres P Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28c7879e..ab5ffab7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1156,18 +1156,13 @@ install_package() { check_sanity() { # check for no-no's in the build script - if [[ -z $pkgname ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgname" - return 1 - fi - if [[ -z $pkgver ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgver" - return 1 - fi - if [[ -z $pkgrel ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgrel" - return 1 - fi + local i + for i in 'pkgname' 'pkgrel' 'pkgver'; do + if [[ -z ${!i} ]]; then + error "$(gettext "%s is not allowed to be empty.")" "$i" + return 1 + fi + done local name for name in "${pkgname[@]}"; do -- cgit v1.2.3-24-g4f1b