diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-05-20 19:29:04 -0600 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-05-20 19:29:04 -0600 |
commit | 3958366ed8534bc8f97677ceec47667683f54d19 (patch) | |
tree | 4a3c836abbad5f027ffd7b72b1d0754feb2db26c | |
parent | 5bb31c971272490bd4f1566c953b2fdaea42995c (diff) |
libremakepkg: Don't pass extra arguments to makepkg.
Packages should be buildable without any extra incantations, and it was
more of a source of mistakes than anything else.
-rwxr-xr-x | src/chroot-tools/libremakepkg | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 8d74dc3..c3d5650 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -5,7 +5,7 @@ set -euE # Copyright (C) 2010-2012 Nicolás Reynolds <fauno@parabola.nu> # Copyright (C) 2010-2012 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com> # Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu> -# Copyright (C) 2012-2014 Luke Shumaker <lukeshu@sbcglobal.net> +# Copyright (C) 2012-2015 Luke Shumaker <lukeshu@sbcglobal.net> # # License: GNU GPLv2+ # @@ -130,7 +130,7 @@ build() ( # The main program ############################################################# usage() { - print "Usage: %s [options] [-- makepkg args]" "${0##*/}" + print "Usage: %s [options]" "${0##*/}" print 'This program will build your package.' echo prose 'If run from outside of a chroot, command will make the following @@ -196,8 +196,10 @@ main() { esac done shift $(($OPTIND - 1)) - # Pass all arguments after -- right to makepkg - makepkg_args+=("$@") + if [[ $# != 0 ]]; then + error 'Extra arguments: %s' "$*" + return 1 + fi # Resolve the chroot path ############################################## local copydir |