moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: retire XBPS_PKGDESTDIR

Browse source 
Historically, PKGDESTDIR was only set during pkg_install, and
XBPS_PKGDESTDIR was set to indicate that we're in subpkg's
pkg_install.

However, from 0b95cb8f5d, (Merge xbps-src code to make it usable in
a standalone mode., 2014-03-22), PKGDESTDIR is always set,
regardless of states.

Let's drop all usages of XBPS_PKGDESTDIR.

While we're at it, error out of vmove is used outside of subpkg.
This commit is contained in:
Đoàn Trần Công Danh 2021-07-03 10:50:39 +07:00 • committed by Đoàn Trần Công Danh
parent b0d6286bc9
commit d8e2056a8f
2 changed files with 22 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/xbps-src/libexec/xbps-src-doinstall.sh
View file

@ -58,7 +58,6 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
install -d $PKGDESTDIR
if declare -f pkg_install >/dev/null; then
export XBPS_PKGDESTDIR=1
run_pkg_hooks pre-install
run_func pkg_install
fi