From 84f29cd82462fe7b215c0761ede8bb680f24651a Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 27 Nov 2007 17:54:58 -0600
Subject: Clarify message when PKGBUILD does not exist and always have help
 available

makechrootpkg should check for a PKGBUILD and user credentials after the
option to print usage is granted.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 makechrootpkg | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'makechrootpkg')

diff --git a/makechrootpkg b/makechrootpkg
index 1ebf705..2a6e1b0 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -16,17 +16,6 @@ chrootdir="$CHROOT_SHELL"
 
 APPNAME=$(basename "${0}")
 
-if [ ! -f PKGBUILD ]; then
-	echo "This must be run in the directory of a built package."
-	exit 1
-fi
-source PKGBUILD
-
-if [ "$EUID" != "0" ]; then
-    echo "This script must be run as root."
-    exit 1
-fi
-
 usage ()
 {
     echo "usage ${APPNAME} [-h] [-c CHROOT_SHELL] [--] [makepkg args]"
@@ -61,6 +50,17 @@ done
 # Pass all arguments after -- right to makepkg
 MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
 
+if [ "$EUID" != "0" ]; then
+    echo "This script must be run as root."
+    exit 1
+fi
+
+if [ ! -f PKGBUILD ]; then
+	echo "This must be run in a directory containing a PKGBUILD."
+	exit 1
+fi
+source PKGBUILD
+
 if [ ! -d "$chrootdir" ]; then
     echo "No \$CHROOT_SHELL defined, or invalid path"
     exit 1
-- 
cgit v1.2.3-24-g4f1b