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

xbps-src: simplify chroot_handler usage.

Browse source
This commit is contained in:
Juan RP 2015-01-04 11:41:22 +01:00
parent 9c4b88d2d5
commit 0e0eb9001a
2 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/xbps-src/shutils/chroot.sh
View file

@ -164,7 +164,7 @@ chroot_handler() {
local action="$1" pkg="$2" rv=0 arg= _envargs= _chargs= local action="$1" pkg="$2" rv=0 arg= _envargs= _chargs=
if [ -n "$IN_CHROOT" -o -z "$CHROOT_READY" ]; then if [ -n "$IN_CHROOT" -o -z "$CHROOT_READY" ]; then
return 0 return 1
fi fi
# Debian uses /run/shm instead... # Debian uses /run/shm instead...
if [ -d /run/shm ]; then if [ -d /run/shm ]; then

33
xbps-src
View file

@ -534,57 +534,38 @@ case "$XBPS_TARGET" in
install_bbootstrap install_bbootstrap
;; ;;
bootstrap-update) bootstrap-update)
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler ${XBPS_TARGET} || remove_pkg_autodeps
chroot_handler ${XBPS_TARGET} dummy
else
pkgver=xbps-src
remove_pkg_autodeps
${XBPS_INSTALL_CMD} -yu ${XBPS_INSTALL_CMD} -yu
fi
;; ;;
chroot) chroot)
chroot_handler chroot dummy chroot_handler chroot dummy
;; ;;
clean) clean)
if [ -z "$XBPS_TARGET_PKG" ]; then if [ -z "$XBPS_TARGET_PKG" ]; then
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler remove-autodeps || remove_pkg_autodeps
chroot_handler remove-autodeps
else
pkgver=xbps-src
remove_pkg_autodeps
fi
msg_normal "xbps-src: cleaning up masterdir...\n" msg_normal "xbps-src: cleaning up masterdir...\n"
rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
else else
read_pkg read_pkg
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG || {
chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG || exit $?
else
remove_pkg_wrksrc $wrksrc remove_pkg_wrksrc $wrksrc
remove_pkg_statedir remove_pkg_statedir
if declare -f do_clean >/dev/null; then if declare -f do_clean >/dev/null; then
run_func do_clean run_func do_clean
fi fi
fi
remove_pkg $XBPS_CROSS_BUILD remove_pkg $XBPS_CROSS_BUILD
}
fi fi
;; ;;
remove-autodeps) remove-autodeps)
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler $XBPS_TARGET || remove_pkg_autodeps
chroot_handler remove-autodeps
else
pkgver=xbps-src
remove_pkg_autodeps
fi
;; ;;
fetch|extract|build|configure|install|pkg) fetch|extract|build|configure|install|pkg)
BEGIN_INSTALL=1 BEGIN_INSTALL=1
read_pkg read_pkg
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG || {
chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG
else
install_pkg $XBPS_TARGET $XBPS_CROSS_BUILD install_pkg $XBPS_TARGET $XBPS_CROSS_BUILD
fi }
;; ;;
remove|remove-destdir) remove|remove-destdir)
read_pkg read_pkg