makechrootpkg: /chrootbuild: accept makepkg_args as arguments rather than embedding.

This commit is contained in:
Luke Shumaker 2017-04-02 04:09:58 -04:00 committed by Jan Alexander Steffens (heftig)
parent 189efd3bc0
commit 253bb4c8d4
No known key found for this signature in database
GPG Key ID: A5E9288C4FA415FA
1 changed files with 2 additions and 4 deletions

View File

@ -190,9 +190,7 @@ EOF
{ {
printf '#!/bin/bash\n' printf '#!/bin/bash\n'
declare -f _chrootbuild declare -f _chrootbuild
printf '_chrootbuild' printf '_chrootbuild "$@" || exit\n'
printf ' %q' "${makepkg_args[@]}"
printf ' || exit\n'
if $run_namcap; then if $run_namcap; then
declare -f _chrootnamcap declare -f _chrootnamcap
@ -338,7 +336,7 @@ if arch-nspawn "$copydir" \
--bind="$PWD:/startdir" \ --bind="$PWD:/startdir" \
--bind="$SRCDEST:/srcdest" \ --bind="$SRCDEST:/srcdest" \
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
/chrootbuild /chrootbuild "${makepkg_args[@]}"
then then
move_products move_products
else else