From 70b5d07ca90e03e216625ada1343a927b71f6ce2 Mon Sep 17 00:00:00 2001 From: Stefano Capitani Date: Thu, 20 May 2021 23:44:49 +0200 Subject: [PATCH] Improve remove Signed-off-by: Stefano Capitani --- lib/util-iso.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 35bf760..6439423 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -196,10 +196,13 @@ assemble_iso(){ make_iso() { msg "Start [Build ISO]" msg2 "Remove gnugp" - find . -type d -name '*gnupg' -exec rm -r {} + touch "${iso_root}/.miso" for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do if [[ "${sfs_dir}" != "${work_dir}" ]]; then + root_fs=$(echo "${sfs_dir}" | rev | cut -d'/' -f 1 | rev) + if [[ "${root_fs}" == "rootfs" ]]; then + rm -rf "${sfs_dir}"/etc/pacman.d/gnupg + fi make_sfs "${sfs_dir}" fi done