From ff1a547ee276e1c04fab146a0860b8bcf95508bc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Jun 2015 10:52:48 +0200 Subject: [PATCH] Revert "chroot-style: u{chroot,unshare}: set POSIXLY_CORRECT to behave in POSIX mode." This reverts commit 5a4c1c4ebe69a99fde15196b6a3c8159f86f820d. Breaks xbps-src -a target ..., so revert this for now. --- common/chroot-style/uchroot.sh | 6 +++--- common/chroot-style/uunshare.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/chroot-style/uchroot.sh b/common/chroot-style/uchroot.sh index c881b033d58..395f9a64903 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,5 +18,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then exit 1 fi -export POSIXLY_CORRECT=1 -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 bc722151f44..510b9c24a7b 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,5 +18,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then exit 1 fi -export POSIXLY_CORRECT=1 -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 -- $@