Code cleanup #33

Manually merged
jlecour merged 71 commits from jlecour-refactoring into master 2020-04-17 15:32:41 +02:00
Showing only changes of commit 3198ba7f37 - Show all commits

View file

@ -91,13 +91,18 @@ for jail_name in $(jails_list); do
# shellcheck disable=SC2046
incs_to_delete=$(echo $(incs_list "${jail_name}") | grep -v -f "${incs_policy_keep_file}")
for inc_name in ${incs_to_delete}; do
inc_path=$(inc_path "${jail_name}" "${inc_name}")
if is_btrfs "${inc_path}"; then
delete_inc_btrfs "${jail_name}" "${inc_name}"
else
delete_inc_ext4 "${jail_name}" "${inc_name}"
fi
done
if [ -n "${incs_to_delete}" ]; then
notice "${jail_name}: incs to be deleted : $(echo "${incs_to_delete}" | tr '\n', ',')."
for inc_name in ${incs_to_delete}; do
inc_path=$(inc_path "${jail_name}" "${inc_name}")
if is_btrfs "${inc_path}"; then
delete_inc_btrfs "${jail_name}" "${inc_name}"
else
delete_inc_ext4 "${jail_name}" "${inc_name}"
fi
done
else
notice "${jail_name}: no inc to be deleted."
fi
fi
done