From dc37236d19058677a2d506e74d55b6498e8d1b93 Mon Sep 17 00:00:00 2001
From: hayao <shun819.mail@gmail.com>
Date: Sat, 11 Jul 2020 16:05:17 +0900
Subject: [PATCH] [update] : Added tarball cleanup

---
 system/mkalteriso.sh | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/system/mkalteriso.sh b/system/mkalteriso.sh
index 1bdb8c9b..2db9753e 100755
--- a/system/mkalteriso.sh
+++ b/system/mkalteriso.sh
@@ -198,18 +198,8 @@ _pacman_file ()
     _msg_info "Packages installed successfully!"
 }
 
-# Cleanup airootfs
-_cleanup () {
-    _msg_info "Cleaning up what we can on airootfs..."
 
-    # Delete initcpio image(s)
-    if [[ -d "${work_dir}/airootfs/boot" ]]; then
-        find "${work_dir}/airootfs/boot" -type f -name '*.img' -delete
-    fi
-    # Delete kernel(s)
-    if [[ -d "${work_dir}/airootfs/boot" ]]; then
-        find "${work_dir}/airootfs/boot" -type f -name 'vmlinuz*' -delete
-    fi
+_cleanup_common () {
     # Delete pacman database sync cache files (*.tar.gz)
     if [[ -d "${work_dir}/airootfs/var/lib/pacman" ]]; then
         find "${work_dir}/airootfs/var/lib/pacman" -maxdepth 1 -type f -delete
@@ -232,6 +222,30 @@ _cleanup () {
     fi
     # Delete package pacman related files.
     find "${work_dir}" \( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" \) -delete
+}
+
+# Cleanup airootfs
+_cleanup () {
+    _msg_info "Cleaning up what we can on airootfs..."
+
+    _cleanup_common
+
+    # Delete initcpio image(s)
+    if [[ -d "${work_dir}/airootfs/boot" ]]; then
+        find "${work_dir}/airootfs/boot" -type f -name '*.img' -delete
+    fi
+    # Delete kernel(s)
+    if [[ -d "${work_dir}/airootfs/boot" ]]; then
+        find "${work_dir}/airootfs/boot" -type f -name 'vmlinuz*' -delete
+    fi
+
+    _msg_info "Done!"
+}
+
+# Cleanup airootfs
+_cleanup_tarball () {
+    _msg_info "Cleaning up what we can on airootfs for tarball..."
+    _cleanup_common
     _msg_info "Done!"
 }
 
@@ -384,6 +398,8 @@ command_tarball () {
         _msg_error "The path '${work_dir}/airootfs' does not exist" 1
     fi
 
+    _cleanup_tarball
+
     mkdir -p "${out_dir}"
     _msg_info "Creating tarball..."
 
-- 
2.11.0