From 31679c601015d7299fdbf6959d04216ac6340450 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Mon, 16 Apr 2018 14:15:15 +0200
Subject: [PATCH] common: Fix command line parsing with uchroot and uunshare
 for xbps-0.52.

---
 common/chroot-style/uchroot.sh  | 2 +-
 common/chroot-style/uunshare.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/chroot-style/uchroot.sh b/common/chroot-style/uchroot.sh
index 395f9a64903..2f9dbb2d45f 100755
--- a/common/chroot-style/uchroot.sh
+++ b/common/chroot-style/uchroot.sh
@@ -18,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 $CMD -- $@
+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 510b9c24a7b..7dc476a4627 100755
--- a/common/chroot-style/uunshare.sh
+++ b/common/chroot-style/uunshare.sh
@@ -18,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 $CMD -- $@
+exec xbps-uunshare $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} -- $MASTERDIR $CMD $@