From 1e1e1e481e335988d00c842169966f0fa8cb43b3 Mon Sep 17 00:00:00 2001 From: Jason Chu Date: Sun, 4 Nov 2007 15:01:22 -0800 Subject: Accept options to makepkg after a -- so that we can accept longopts for makepkg and even options that are used by makechrootpkg --- makechrootpkg | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'makechrootpkg') diff --git a/makechrootpkg b/makechrootpkg index 879d932..e50d43e 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -29,7 +29,7 @@ fi usage () { - echo "usage ${APPNAME} [-h] [-c CHROOT_SHELL] [makepkg args]" + echo "usage ${APPNAME} [-h] [-c CHROOT_SHELL] [--] [makepkg args]" echo " Run this script in a PKGBUILD dir to build a package inside a" echo " clean chroot. All unrecognized arguments passed to this script" echo " will be passed to makepkg." @@ -43,6 +43,9 @@ usage () echo "command:" echo " mkarchroot \$CHROOT_SHELL base base-devel sudo" echo "" + echo "If you have problems passing params to makepkg or need to pass long" + echo "options, put -- between the makechrootpkg args and the makepkg args" + echo "" echo "Default makepkg args: $MAKEPKG_ARGS" exit 1 } @@ -55,6 +58,9 @@ while getopts ':c:h' arg; do esac done +# Pass all arguments after -- right to makepkg +MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}" + if [ ! -d "$chrootdir" ]; then echo "No \$CHROOT_SHELL defined, or invalid path" exit 1 -- cgit v1.2.3-24-g4f1b