From d088888be34e64faf9734b1548d6e545aa9c271c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 6 Jun 2015 14:42:38 -0600
Subject: Update to new devtools.

---
 src/chroot-tools/libremakepkg | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/chroot-tools/libremakepkg')

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 #############################################################
-- 
cgit v1.2.3-54-g00ecf