diff options
author | Piraty <piraty1@inbox.ru> | 2019-10-13 18:27:54 +0000 |
---|---|---|
committer | Juan RP <xtraeme@gmail.com> | 2019-10-21 16:55:19 +0000 |
commit | 80e4a3992670917a693a7c62329064f09eb24490 (patch) | |
tree | a64ea46320a0da4053bac709b5a5541b55daa89c /xbps-src | |
parent | 427af2c86402eb5dd3d0bea5918253e55ecbaba6 (diff) | |
download | void-packages-80e4a3992670917a693a7c62329064f09eb24490.tar void-packages-80e4a3992670917a693a7c62329064f09eb24490.tar.gz void-packages-80e4a3992670917a693a7c62329064f09eb24490.tar.bz2 void-packages-80e4a3992670917a693a7c62329064f09eb24490.tar.lz void-packages-80e4a3992670917a693a7c62329064f09eb24490.tar.xz void-packages-80e4a3992670917a693a7c62329064f09eb24490.tar.zst void-packages-80e4a3992670917a693a7c62329064f09eb24490.zip |
xbps-src: (zap) correctly empty the masterdir
Instead of relying on a potentially outdated list of files and dirs to
remove, just remove+recreate the whole masterdir.
This previously led to leftover .xbps* files, which broke subsequent
operations
Fixes #14476
Diffstat (limited to 'xbps-src')
-rwxr-xr-x | xbps-src | 18 |
1 files changed, 3 insertions, 15 deletions
@@ -329,21 +329,9 @@ bootstrap_update() { } masterdir_zap() { - for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \ - opt proc root run sbin sys tmp usr var host media xbps \ - void-packages .xbps_chroot_init .xbps_chroot_configured; do - if [ -d "$XBPS_MASTERDIR/$f" ]; then - echo "Removing directory $XBPS_MASTERDIR/$f ..." - rm -rf $XBPS_MASTERDIR/$f - elif [ -h "$XBPS_MASTERDIR/$f" ]; then - echo "Removing link $XBPS_MASTERDIR/$f ..." - rm -f $XBPS_MASTERDIR/$f - elif [ -f "$XBPS_MASTERDIR/$f" ]; then - echo "Removing file $XBPS_MASTERDIR/$f ..." - rm -f $XBPS_MASTERDIR/$f - fi - done - echo "$XBPS_MASTERDIR masterdir cleaned up." + rm -rf "$XBPS_MASTERDIR" + mkdir -p "$XBPS_MASTERDIR" + msg_normal "$XBPS_MASTERDIR masterdir cleaned up." } exit_func() { |