From e53a6a905c9aac70eb0609f38ce3fe75b5ed8e1e Mon Sep 17 00:00:00 2001
From: hayao <shun819.mail@gmail.com>
Date: Thu, 12 Mar 2020 21:44:25 +0900
Subject: [PATCH] [update] : Enhanced cleaning.

---
 build.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 19916ad3..cb55cb57 100755
--- a/build.sh
+++ b/build.sh
@@ -107,7 +107,7 @@ run_once() {
 }
 
 # rm helper
-function remove () {
+remove() {
     local _list
     local _file
     _list=($(echo "$@"))
@@ -259,7 +259,7 @@ make_customize_airootfs() {
     else
         ${mkalteriso} ${alteriso_option} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r "/root/customize_airootfs.sh -p ${password} ${options} -k ${kernel}" run
     fi
-    rm ${work_dir}/x86_64/airootfs/root/customize_airootfs.sh
+    remove ${work_dir}/x86_64/airootfs/root/customize_airootfs.sh
 }
 
 # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
@@ -454,16 +454,24 @@ make_prepare() {
     cp -a -l -f ${work_dir}/x86_64/airootfs ${work_dir}
     ${mkalteriso} ${alteriso_option} -w "${work_dir}" -D "${install_dir}" pkglist
     ${mkalteriso} ${alteriso_option} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} -c "${sfs_comp}" -t "${sfs_comp_opt}" prepare
-    rm -rf ${work_dir}/airootfs
+    remove ${work_dir}/airootfs
 
     if [[ ${cleaning} = true ]]; then
-        rm -rf ${work_dir}/x86_64/airootfs
+        remove ${work_dir}/x86_64/airootfs
     fi
 }
 
 # Build ISO
 make_iso() {
     ${mkalteriso} ${alteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
+
+    if [[ ${cleaning} = true ]]; then
+        remove $(ls ${work_dir}| grep "build.make")
+        remove ${work_dir}/pacman.conf
+        remove ${work_dir}/efiboot
+        remove ${work_dir}/iso
+        remove ${work_dir}/x86_64
+    fi
 }
 
 if [[ ${EUID} -ne 0 ]]; then
-- 
2.11.0