sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[molecules/arm-base] fix paths removal logic

Browse Source
This commit is contained in:
Fabio Erculiani 2012-02-01 11:36:22 +01:00
parent fd95125bf6
commit c7efe90982
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
molecules/arm-base.common
View File

@ -60,7 +60,7 @@ release_string: Sabayon Linux
# Directories to remove completely (comma separated) # Directories to remove completely (comma separated)
paths_to_remove: paths_to_remove:
/var/lib/entropy/client/database/*/sabayonlinux.org, /var/lib/entropy/client/database/*/sabayon*,
/root/.subversion, /root/.subversion,
/lib/udev-state/devices.tar.bz2, /lib/udev-state/devices.tar.bz2,
/var/log/scrollkeeper.log, /var/log/genkernel.log, /var/log/scrollkeeper.log, /var/log/genkernel.log,
@ -79,8 +79,6 @@ paths_to_remove:
/var/lib/entropy/smartapps/*/*, /var/lib/entropy/smartapps/*/*,
/var/lib/entropy/smartapps/*/*, /var/lib/entropy/smartapps/*/*,
/var/lib/entropy/tmp/*, /var/lib/entropy/tmp/*,
/var/lib/entropy/packages*/*,
/var/lib/entropy/client/packages*/*,
/var/tmp/entropy/*, /var/tmp/entropy/*,
/*.txt, /*.txt,
/usr/portage/a*, /usr/portage/a*,

6
scripts/mkloopcard.sh
View File

@ -170,16 +170,14 @@ export LC_ALL=C
# work out paths to empty and paths to remove # work out paths to empty and paths to remove
if [ -n "${PATHS_TO_REMOVE}" ]; then if [ -n "${PATHS_TO_REMOVE}" ]; then
for path in $(echo ${PATHS_TO_REMOVE} | tr ";" "\n"); do for path in $(echo ${PATHS_TO_REMOVE} | tr ";" "\n"); do
path="${tmp_dir}/${path}"
echo "Removing: ${path}" echo "Removing: ${path}"
rm -rf "${path}" rm -rf "${tmp_dir}"/${path}
done done
fi fi
if [ -n "${PATHS_TO_EMPTY}" ]; then if [ -n "${PATHS_TO_EMPTY}" ]; then
for path in $(echo ${PATHS_TO_EMPTY} | tr ";" "\n"); do for path in $(echo ${PATHS_TO_EMPTY} | tr ";" "\n"); do
path="${tmp_dir}/${path}"
echo "Emptying: ${path}" echo "Emptying: ${path}"
rm -rf "${path}"/* rm -rf "${tmp_dir}"/"${path}"/*
done done
fi fi