jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: do not append $PATH to $PATH on every prepare_tmpl() call!

Browse source 
--HG--
rename : xbps-src/shutils/tmpl_funcs.sh => xbps-src/shutils/tmpl_funcs.sh.in
This commit is contained in:
Juan RP 2010-05-06 01:21:27 +02:00
parent aeb5bb84af
commit 481e74178e
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xbps-src/shutils/Makefile
View file

@ -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:

12
xbps-src/shutils/tmpl_funcs.sh → xbps-src/shutils/tmpl_funcs.sh.in
View file

@ -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
}