From 12e401426dec074cf156da20140d291dfc1f4764 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Tue, 2 Oct 2018 17:59:34 +0800 Subject: [PATCH] updated --- pkgbuild | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgbuild b/pkgbuild index fcb91f8..c5f1603 100755 --- a/pkgbuild +++ b/pkgbuild @@ -586,7 +586,7 @@ main() { # show usage if [ "$SHOWHELP" ]; then help - abort 0 + exit 0 fi if [ -f $PKGBUILD_BSCRIPT ]; then @@ -600,6 +600,20 @@ main() { backup=$(grep "^# backup[[:blank:]]*:" $PKGBUILD_BSCRIPT | sed 's/^# backup[[:blank:]]*:[[:blank:]]*//') depends=$(grep "^# depends[[:blank:]]*:" $PKGBUILD_BSCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//') noextract=$(grep "^# noextract[[:blank:]]*:" $PKGBUILD_BSCRIPT | sed 's/^# noextract[[:blank:]]*:[[:blank:]]*//') + + if [ -z "$SOURCE_DIR" ]; then + msgerr "Option '--srcdir=' need argument (path)" + exit 1 + elif [ -z "$PACKAGE_DIR" ]; then + msgerr "Option '--pkgdir=' need argument (path)" + exit 1 + fi + checkdir "$SOURCE_DIR" "$PACKAGE_DIR" "$WORK_DIR" + + check_buildscript + set_options + + PKGNAME="$name-$version-$release.spkg.txz" LOCK_FILE="/tmp/pkgbuild.$name.lock" @@ -616,20 +630,6 @@ main() { fi fi - if [ -z "$SOURCE_DIR" ]; then - msgerr "Option '--srcdir=' need argument (path)" - abort 1 - elif [ -z "$PACKAGE_DIR" ]; then - msgerr "Option '--pkgdir=' need argument (path)" - abort 1 - fi - checkdir "$SOURCE_DIR" "$PACKAGE_DIR" "$WORK_DIR" - - check_buildscript - set_options - - PKGNAME="$name-$version-$release.spkg.txz" - # download source only if [ "$DOWNLOAD_ONLY" ]; then download_src