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

xbps-src: bail out if the xbps static utils aren't installed in masterdir.

Browse source
This commit is contained in:
Juan RP 2011-01-16 18:13:55 +01:00
parent 3010150032
commit 0e74f8bc18
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xbps-src/xbps-src.sh.in
View file

@ -50,13 +50,18 @@ check_reqhost_utils()
{ {
[ -n "$in_chroot" ] && return 0 [ -n "$in_chroot" ] && return 0
for f in gawk bash sed gcc msgfmt patch makeinfo perl fakeroot \ for f in gawk bash sed gcc msgfmt patch makeinfo perl fakeroot; do
xbps-bin.static xbps-repo.static xbps-uhelper.static; do
if ! command -v ${f} 2>&1 >/dev/null; then if ! command -v ${f} 2>&1 >/dev/null; then
echo "${f} is missing in your system, can't continue! exiting..." echo "${f} is missing in your system, can't continue! exiting..."
exit 1 exit 1
fi fi
done done
for f in bin repo uhelper; do
if [ ! -x ${XBPS_MASTERDIR}/usr/local/sbin/xbps-${f}.static ]; then
echo "xbps-${f}.static not found in ${XBPS_MASTERDIR}!"
exit 1
fi
done
} }
usage() usage()
@ -212,11 +217,6 @@ if [ -z "$target" ]; then
usage && exit 1 usage && exit 1
fi fi
#
# Check for required utilities in host system.
#
check_reqhost_utils
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
XBPS_CONFIG_FILE="/usr/local/etc/xbps-src.conf" XBPS_CONFIG_FILE="/usr/local/etc/xbps-src.conf"
fi fi
@ -231,6 +231,11 @@ fi
. @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh . @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh
set_defvars set_defvars
#
# Check for required utilities in host system.
#
check_reqhost_utils
. $XBPS_SHUTILSDIR/common_funcs.sh . $XBPS_SHUTILSDIR/common_funcs.sh
# #