From a7059483f5a5f4de04433de71b9aa47eff4dbc15 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 15 Nov 2011 17:15:53 +0100
Subject: [PATCH] xbps-src: always generate xbps-shell with a proper PATH. Bump
 version.

---
 xbps-src/shutils/chroot.sh.in | 6 ++++--
 xbps-src/xbps-src.sh.in       | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xbps-src/shutils/chroot.sh.in b/xbps-src/shutils/chroot.sh.in
index e9604d0de6..a57e637315 100644
--- a/xbps-src/shutils/chroot.sh.in
+++ b/xbps-src/shutils/chroot.sh.in
@@ -101,8 +101,6 @@ _EOF
 		fi
 	fi
 
-	[ -s $XBPS_MASTERDIR/bin/xbps-shell ] && return 0
-
 	# Create custom script to start the chroot bash shell.
 	cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF
 #!/bin/sh
@@ -111,6 +109,10 @@ _EOF
 . /usr/local/share/xbps-src/shutils/init_funcs.sh
 set_defvars
 
+PATH=/tools/bin:/usr/local/sbin:/bin:/usr/bin:/sbin
+PATH=\$PATH:/usr/local/bin:/usr/lib/perl5/core_perl/bin
+export PATH
+
 exec env PS1="[\u@masterdir-chroot \W]$ " /bin/bash
 _EOF
 	chmod 755 $XBPS_MASTERDIR/bin/xbps-shell
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 2dbd0ed291..ab357c2e8d 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -23,7 +23,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
-readonly XBPS_SRC_BUILD_VERSION=20111115-1
+readonly XBPS_SRC_BUILD_VERSION=20111115-2
 XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
 
 PROGNAME=$(basename $0)
@@ -318,6 +318,7 @@ if [ -z "$IN_CHROOT" ]; then
 	MYPATH="$PATH:$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/usr/bin"
 	MYPATH="$MYPATH:$XBPS_MASTERDIR/usr/local/bin"
 	MYPATH="$MYPATH:$XBPS_MASTERDIR/usr/local/sbin"
+	export PATH="$MYPATH"
 else
 	if [ -n "$XBPS_CCACHE" ]; then
 		CCACHEPATH="/usr/lib/ccache/bin"
@@ -330,12 +331,9 @@ else
 				mkdir -p $XBPS_MASTERDIR/host/ccache
 			export CCACHE_DIR="$XBPS_MASTERDIR/host/ccache"
 		fi
+		export PATH="$CCACHEPATH:$PATH"
 	fi
-	# In chroot always prefer tools from bootstrap.
-	MYPATH="$CCACHEPATH:/tools/bin:/usr/local/sbin:/bin:/usr/bin"
-	MYPATH="$MYPATH:/sbin:/usr/local/bin:/usr/sbin"
 fi
-export PATH="$MYPATH"
 
 #
 # If masterdir is ready (base-chroot installed and chroot set up) and