From 1ffba0ae712332db5cfed319d4d3aef512cbb672 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Wed, 3 Jun 2015 20:12:49 +0200
Subject: [PATCH] xbps-src: fix regression with the proot chroot-style.

---
 common/chroot-style/uchroot.sh    | 5 +++--
 common/chroot-style/uunshare.sh   | 5 +++--
 common/xbps-src/shutils/chroot.sh | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common/chroot-style/uchroot.sh b/common/chroot-style/uchroot.sh
index a5c0a3617e..395f9a6490 100755
--- a/common/chroot-style/uchroot.sh
+++ b/common/chroot-style/uchroot.sh
@@ -6,7 +6,8 @@ readonly MASTERDIR="$1"
 readonly DISTDIR="$2"
 readonly HOSTDIR="$3"
 readonly EXTRA_ARGS="$4"
-shift 4
+readonly CMD="$5"
+shift 5
 
 if ! command -v xbps-uchroot >/dev/null 2>&1; then
 	exit 1
@@ -17,4 +18,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-exec xbps-uchroot $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $@
+exec xbps-uchroot $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $CMD -- $@
diff --git a/common/chroot-style/uunshare.sh b/common/chroot-style/uunshare.sh
index fce811d7d0..510b9c24a7 100755
--- a/common/chroot-style/uunshare.sh
+++ b/common/chroot-style/uunshare.sh
@@ -6,7 +6,8 @@ readonly MASTERDIR="$1"
 readonly DISTDIR="$2"
 readonly HOSTDIR="$3"
 readonly EXTRA_ARGS="$4"
-shift 4
+readonly CMD="$5"
+shift 5
 
 if ! command -v xbps-uunshare >/dev/null 2>&1; then
 	exit 1
@@ -17,4 +18,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-exec xbps-uunshare $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $@
+exec xbps-uunshare $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $CMD -- $@
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 67148a3146..00944a75e2 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -147,7 +147,7 @@ chroot_sync_repos() {
         # Make sure to sync index for remote repositories.
         $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
             $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" \
-            "$XBPS_CHROOT_CMD_ARGS" xbps-install -- -S
+            "$XBPS_CHROOT_CMD_ARGS" xbps-install -S
     fi
 
     if [ -n "$XBPS_CROSS_BUILD" ]; then
@@ -160,7 +160,7 @@ chroot_sync_repos() {
             env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \
                 $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
                 $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \
-                xbps-install -- -r $XBPS_CROSS_BASE -S
+                xbps-install -r $XBPS_CROSS_BASE -S
         fi
     fi
 
@@ -209,7 +209,7 @@ chroot_handler() {
         env -i PATH="/usr/bin:/usr/sbin:$PATH" HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \
             $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
             $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \
-            /void-packages/xbps-src -- $action $pkg
+            /void-packages/xbps-src $action $pkg
         rv=$?
     fi