diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-06 14:42:38 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-06 14:45:48 -0600 |
| commit | d088888be34e64faf9734b1548d6e545aa9c271c (patch) | |
| tree | f43a9a8b37db784bee0569999c40327fd5daf923 /src/chroot-tools/libremakepkg | |
| parent | 148d5dbbb7ed1117765387eb5741f11c9c1897ff (diff) | |
Update to new devtools.
Diffstat (limited to 'src/chroot-tools/libremakepkg')
| -rwxr-xr-x | src/chroot-tools/libremakepkg | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 767dff8..a226e38 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -106,8 +106,9 @@ cleanup() { } build() ( - local copydir=$1; shift - local repack=$1; shift + local copydir=$1 + local repack=$2 + local makepkg_args=("${@:3}") local run_ynet=() local run_nnet=() @@ -121,10 +122,10 @@ build() ( $NONET || run_nnet=("${run_ynet[@]}") prepare_chroot "$copydir" "$LIBREHOME" "$repack" false - "${run_ynet[@]}" /chrootprepare false "$@" |& indent + "${run_ynet[@]}" /chrootprepare "${makepkg_args[@]}" |& indent run_hook pre_build "$copydir" - trap "run_hook post_build '$copydir'" EXIT - "${run_nnet[@]}" /chrootbuild false "$@" |& indent + trap "run_hook post_build $(printf '%q' "$copydir")" EXIT + "${run_nnet[@]}" /chrootbuild "${makepkg_args[@]}" |& indent ) # The main program ############################################################# |