Commit 84f29cd8 authored by Dan McGee's avatar Dan McGee Committed by Aaron Griffin
Browse files

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: default avatarDan McGee <dan@archlinux.org>
Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent e32a2bb7

makechrootpkg

+11 −11
Original line number Diff line number Diff line
@@ -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