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

hooks/post-install/03-remove-empty-dirs.sh: use find -delete instead of rmdir -p

Browse source 
rmdir -p could end up deleting even /destdir when a empty package would
not have any subpackages with a i686 masterdir.
This commit is contained in:
John 2019-10-21 00:13:40 +02:00 • committed by John Zimmermann
parent a93c02d3cc
commit e351f6b462
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/hooks/post-install/03-remove-empty-dirs.sh
View file

@ -2,13 +2,9 @@
hook() { hook() {
if [ -d "${PKGDESTDIR}" ]; then if [ -d "${PKGDESTDIR}" ]; then
find "${PKGDESTDIR}" -type d -empty|sort -r|while read f; do find "${PKGDESTDIR}" -mindepth 1 -type d -empty -print -delete|sort -r|while read f; do
_dir="${f##${PKGDESTDIR}}" _dir="${f##${PKGDESTDIR}}"
[ -z "${_dir}" ] && continue
rmdir --ignore-fail-on-non-empty -p "$f" &>/dev/null
msg_warn "$pkgver: removed empty dir: ${_dir}\n" msg_warn "$pkgver: removed empty dir: ${_dir}\n"
done done
# Create PKGDESTDIR in case it has been removed previously.
mkdir -p ${PKGDESTDIR}
fi fi
} }