From 481e74178e590f733a9d5193649cf14397811f30 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 6 May 2010 01:21:27 +0200
Subject: [PATCH] xbps-src: do not append $PATH to $PATH on every
 prepare_tmpl() call!

--HG--
rename : xbps-src/shutils/tmpl_funcs.sh => xbps-src/shutils/tmpl_funcs.sh.in
---
 xbps-src/shutils/Makefile                            |  2 +-
 xbps-src/shutils/{tmpl_funcs.sh => tmpl_funcs.sh.in} | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename xbps-src/shutils/{tmpl_funcs.sh => tmpl_funcs.sh.in} (96%)

diff --git a/xbps-src/shutils/Makefile b/xbps-src/shutils/Makefile
index cff7a492006..c9918cb0df7 100644
--- a/xbps-src/shutils/Makefile
+++ b/xbps-src/shutils/Makefile
@@ -1,6 +1,6 @@
 include ../vars.mk
 
-SCRIPTS = chroot.sh init_funcs.sh pkgtarget_funcs.sh
+SCRIPTS = tmpl_funcs.sh chroot.sh init_funcs.sh pkgtarget_funcs.sh
 
 .PHONY: all
 all:
diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh.in
similarity index 96%
rename from xbps-src/shutils/tmpl_funcs.sh
rename to xbps-src/shutils/tmpl_funcs.sh.in
index 1792f2aab56..de64addc275 100644
--- a/xbps-src/shutils/tmpl_funcs.sh
+++ b/xbps-src/shutils/tmpl_funcs.sh.in
@@ -237,13 +237,11 @@ prepare_tmpl()
 	set_tmpl_common_vars
 
 	if [ -z "$in_chroot" ]; then
-		local _PATH
-		_PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin"
-		_PATH="${_PATH}:$XBPS_MASTERDIR/usr/bin"
-		_PATH="${_PATH}:$XBPS_MASTERDIR/usr/sbin"
-		_PATH="${_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
-		_PATH="${_PATH}:/usr/local/sbin"
-		export PATH="${_PATH}:${PATH}"
+		export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin"
+		export PATH="$PATH:$XBPS_MASTERDIR/usr/bin"
+		export PATH="$PATH:$XBPS_MASTERDIR/usr/sbin"
+		export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin"
+		export PATH="$PATH:/sbin:@@XBPS_INSTALL_PREFIX@@/sbin"
 	fi
 }