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

Pass XBPS_MASTERDIR to the xbps-src signal handler.

Browse source
This commit is contained in:
Juan RP 2010-05-14 15:25:07 +02:00
parent fe36d782ca
commit fecc9617dd
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xbps-src/libexec/xbps-src-chroot-helper.sh.in
View file

@ -96,7 +96,9 @@ umount_chroot_fs()
# Remove created dirs # Remove created dirs
if [ ! -f ${XBPS_MASTERDIR}/.xbps_mount_bind_done ]; then if [ ! -f ${XBPS_MASTERDIR}/.xbps_mount_bind_done ]; then
[ -d ${XBPS_MASTERDIR}/xbps ] && rmdir ${XBPS_MASTERDIR}/xbps if [ -d ${XBPS_MASTERDIR}/xbps ]; then
rmdir ${XBPS_MASTERDIR}/xbps 2>/dev/null
fi
fi fi
} }

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

@ -33,12 +33,13 @@
: ${xbps_machine:=$(uname -m)} : ${xbps_machine:=$(uname -m)}
: ${XBPS_UTILS_REQVER:=20100511} : ${XBPS_UTILS_REQVER:=20100511}
trap 'sighandler_exit $?' 0 INT QUIT trap '_MASTERDIR=${XBPS_MASTERDIR} sighandler_exit $?' 0 INT QUIT
sighandler_exit() sighandler_exit()
{ {
# Always unmount in case, we failed before! # Always unmount in case, we failed before!
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
env MASTERDIR="${_MASTERDIR}" \
@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-chroot-helper umount @@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-chroot-helper umount
fi fi
[ -n "$1" ] && exit $1 [ -n "$1" ] && exit $1