From d7c2cc5513cc7e0954f7470538194e91b04f3f86 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 18 Nov 2011 12:02:39 +0100 Subject: [PATCH] xbps-src: doinst-helper: we know exact PATH for chroot case, use it. --- xbps-src/libexec/doinst-helper.sh.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xbps-src/libexec/doinst-helper.sh.in b/xbps-src/libexec/doinst-helper.sh.in index 4069b2ea11..c99859abd2 100644 --- a/xbps-src/libexec/doinst-helper.sh.in +++ b/xbps-src/libexec/doinst-helper.sh.in @@ -29,14 +29,22 @@ PKG_TMPLNAME="$1" if [ -n "${CONFIG_FILE}" -a -r "${CONFIG_FILE}" ]; then . ${CONFIG_FILE} else - . @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf + if [ -n "$IN_CHROOT" ]; then + . /usr/local/etc/xbps-src.conf + else + . @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf + fi fi if [ -n "${MASTERDIR}" ]; then export XBPS_MASTERDIR="${MASTERDIR}" fi -. @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh +if [ -n "$IN_CHROOT" ]; then + . /usr/local/share/xbps-src/shutils/init_funcs.sh +else + . @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh +fi set_defvars