summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-06-29 19:45:42 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-06-30 00:16:34 -0300
commit1114731c288ec59db8281a6422ab7cdd380d1fed (patch)
treeea5142af36c76b349e1617d17f971f5f4ab43e31
parent6a0333c9556cbe43d8eff73a37ae8f862dbba8ba (diff)
[archiso] Rewrite cleanup step in mkarchiso
Currently works partially since in bash "*" is not expanded. Old dirs removed, always empty dirs removed from list. Also cleanup sync databases from pacman 3.4.0, avoiding problems with pacman -Sy since "sync" directory is deleted. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rwxr-xr-xarchiso/mkarchiso19
1 files changed, 12 insertions, 7 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b40eedd..6a8cb68 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -149,13 +149,18 @@ to the iso/ directory.
fi
fi
- # delete a lot of unnecessary cache/log files
- kill_dirs="var/abs var/cache/man var/cache/pacman var/lib/pacman/sync var/log/* var/mail tmp/* initrd"
- for x in ${kill_dirs}; do
- if [ -e "${work_dir}/root-image/${x}" ]; then
- rm -rf "${work_dir}/root-image/${x}"
- fi
- done
+ # Delete pacman database sync cache files (*.tar.gz)
+ find "${work_dir}/root-image/var/lib/pacman" -maxdepth 1 -type f -delete
+ # Delete pacman database sync cache
+ find "${work_dir}/root-image/var/lib/pacman/sync" -delete
+ # Delete pacman package cache
+ find "${work_dir}/root-image/var/cache/pacman/pkg" -type f -delete
+ # Delete all log files, keeps empty dirs.
+ find "${work_dir}/root-image/var/log" -type f -delete
+ # Delete all temporary files and dirs
+ find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete
+ # Delete all temporary files and dirs
+ find "${work_dir}/root-image/tmp" -mindepth 1 -delete
fi
}