summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2018-05-27 10:11:31 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2018-07-02 10:53:53 -0400
commit7036d6aea79cbfc747b5cfc4e11bb750365e0dc2 (patch)
tree84865738ade4e6debd38c3e671f17bf6997c2590
parent302c303bc4b9aa303d7ade7a3874a6504f84abc2 (diff)
revert preserving /var/cache/pacman
-rwxr-xr-xparabolaiso/mkparabolaiso24
1 files changed, 11 insertions, 13 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index deec844..248879e 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -309,19 +309,17 @@ _cleanup () {
if [[ -d "${work_dir}/root-image/boot" ]]; then
find "${work_dir}/root-image/boot" -type f -name 'vmlinuz*' -delete
fi
- if [[ "${enable_offline_install}" == 'false' ]]; then
- # Delete pacman database sync cache files (*.tar.gz)
- if [[ -d "${work_dir}/root-image/var/lib/pacman" ]]; then
- find "${work_dir}/root-image/var/lib/pacman" -maxdepth 1 -type f -delete
- fi
- # Delete pacman database sync cache
- if [[ -d "${work_dir}/root-image/var/lib/pacman/sync" ]]; then
- find "${work_dir}/root-image/var/lib/pacman/sync" -delete
- fi
- # Delete pacman package cache
- if [[ -d "${work_dir}/root-image/var/cache/pacman/pkg" ]]; then
- find "${work_dir}/root-image/var/cache/pacman/pkg" -type f -delete
- fi
+ # Delete pacman database sync cache files (*.tar.gz)
+ if [[ -d "${work_dir}/root-image/var/lib/pacman" ]]; then
+ find "${work_dir}/root-image/var/lib/pacman" -maxdepth 1 -type f -delete
+ fi
+ # Delete pacman database sync cache
+ if [[ -d "${work_dir}/root-image/var/lib/pacman/sync" ]]; then
+ find "${work_dir}/root-image/var/lib/pacman/sync" -delete
+ fi
+ # Delete pacman package cache
+ if [[ -d "${work_dir}/root-image/var/cache/pacman/pkg" ]]; then
+ find "${work_dir}/root-image/var/cache/pacman/pkg" -type f -delete
fi
# Delete all log files, keeps empty dirs.
if [[ -d "${work_dir}/root-image/var/log" ]]; then