From 25b58c7e3a3b822271334e8ba24e4dcd751a8dc5 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Sat, 5 Jul 2025 07:01:06 -0700
Subject: [PATCH] code changes and cleanup

---
 base-image-script/debian-bookworm_pt1.sh     |  2 +-
 base-image-script/debian-bookworm_pt3.sh     | 28 ---------------
 base-image-script/debian-build_pt3.sh        | 36 ++++++++++++++++++++
 base-image-script/debian-bullseye_pt1.sh     |  2 +-
 base-image-script/debian-bullseye_pt3.sh     | 28 ---------------
 base-image-script/debian-buster_pt1.sh       |  2 +-
 base-image-script/debian-buster_pt3.sh       | 21 ------------
 base-image-script/debian-docker-build_pt1.sh |  2 +-
 base-image-script/debian-docker-build_pt3.sh | 28 ---------------
 base-image-script/debian-test_pt1.sh         |  2 +-
 base-image-script/debian-test_pt3.sh         | 33 ------------------
 11 files changed, 41 insertions(+), 143 deletions(-)
 delete mode 100644 base-image-script/debian-bookworm_pt3.sh
 create mode 100644 base-image-script/debian-build_pt3.sh
 delete mode 100644 base-image-script/debian-bullseye_pt3.sh
 delete mode 100644 base-image-script/debian-buster_pt3.sh
 delete mode 100644 base-image-script/debian-docker-build_pt3.sh
 delete mode 100644 base-image-script/debian-test_pt3.sh

diff --git a/base-image-script/debian-bookworm_pt1.sh b/base-image-script/debian-bookworm_pt1.sh
index 01f304a..f5c3bc0 100644
--- a/base-image-script/debian-bookworm_pt1.sh
+++ b/base-image-script/debian-bookworm_pt1.sh
@@ -8,7 +8,7 @@ DEBIAN_RELEASE="bookworm"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
 SCRIPTS_DIR="base-image-script"
 PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
-PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
+PT3_SCRIPT="debian-build_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
diff --git a/base-image-script/debian-bookworm_pt3.sh b/base-image-script/debian-bookworm_pt3.sh
deleted file mode 100644
index 30370a4..0000000
--- a/base-image-script/debian-bookworm_pt3.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2025 fithwum
-# All rights reserved
-set -e
-
-ROOTFS_DIR="${1:-debian-bookworm}"
-TARBALL="${ROOTFS_DIR}.tar.bz2"
-
-echo "[INFO] Attempting to unmount system directories (ignore errors)..."
-for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
-done
-
-echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/"debian-*_pt2.sh 2>/dev/null || true
-
-echo "[INFO] Rootfs size:"
-du -sh "$ROOTFS_DIR"
-
-echo "[INFO] Creating compressed base image..."
-tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-
-echo "[INFO] Image archive size:"
-du -sh "$TARBALL"
-
-# DO NOT DELETE TARBALL — needed by Gitea Action
-# DO NOT UPLOAD HERE — handled by workflow
-echo "[INFO] Leaving tarball for CI to upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-build_pt3.sh b/base-image-script/debian-build_pt3.sh
new file mode 100644
index 0000000..140896f
--- /dev/null
+++ b/base-image-script/debian-build_pt3.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright (c) 2025 fithwum
+# All rights reserved
+set -e
+
+# Auto-detect a single debian-* directory if not passed
+if [ -n "$1" ]; then
+    ROOTFS_DIR="$1"
+else
+    ROOTFS_DIR=$(find . -maxdepth 1 -type d -name "debian-*" | sed 's|^\./||' | head -n 1)
+    if [ -z "$ROOTFS_DIR" ]; then
+        echo "[ERROR] No debian-* rootfs directory found!"
+        exit 1
+    fi
+fi
+
+TARBALL="/output/${ROOTFS_DIR}.tar.bz2"
+
+echo "[INFO] Unmounting system directories (ignore errors)..."
+for dir in sys proc dev/pts dev; do
+    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
+done
+
+echo "[INFO] Removing chroot script..."
+rm -f "$ROOTFS_DIR/root/${ROOTFS_DIR}_pt2.sh" 2>/dev/null || true
+
+echo "[INFO] Rootfs size:"
+du -sh "$ROOTFS_DIR"
+
+echo "[INFO] Creating compressed base image..."
+tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
+
+echo "[INFO] Image archive size:"
+du -sh "$TARBALL"
+
+echo "[INFO] Tarball ready for CI to upload: $TARBALL"
diff --git a/base-image-script/debian-bullseye_pt1.sh b/base-image-script/debian-bullseye_pt1.sh
index 0de3209..07dc3cd 100644
--- a/base-image-script/debian-bullseye_pt1.sh
+++ b/base-image-script/debian-bullseye_pt1.sh
@@ -8,7 +8,7 @@ DEBIAN_RELEASE="bullseye"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
 SCRIPTS_DIR="base-image-script"
 PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
-PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
+PT3_SCRIPT="debian-build_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
diff --git a/base-image-script/debian-bullseye_pt3.sh b/base-image-script/debian-bullseye_pt3.sh
deleted file mode 100644
index 9fecb4e..0000000
--- a/base-image-script/debian-bullseye_pt3.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2025 fithwum
-# All rights reserved
-set -e
-
-ROOTFS_DIR="${1:-debian-bullseye}"
-TARBALL="${ROOTFS_DIR}.tar.bz2"
-
-echo "[INFO] Attempting to unmount system directories (ignore errors)..."
-for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
-done
-
-echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/"debian-*_pt2.sh 2>/dev/null || true
-
-echo "[INFO] Rootfs size:"
-du -sh "$ROOTFS_DIR"
-
-echo "[INFO] Creating compressed base image..."
-tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-
-echo "[INFO] Image archive size:"
-du -sh "$TARBALL"
-
-# DO NOT DELETE TARBALL — needed by Gitea Action
-# DO NOT UPLOAD HERE — handled by workflow
-echo "[INFO] Leaving tarball for CI to upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-buster_pt1.sh b/base-image-script/debian-buster_pt1.sh
index d15145d..2d09fcb 100644
--- a/base-image-script/debian-buster_pt1.sh
+++ b/base-image-script/debian-buster_pt1.sh
@@ -8,7 +8,7 @@ DEBIAN_RELEASE="buster"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
 SCRIPTS_DIR="base-image-script"
 PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
-PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
+PT3_SCRIPT="debian-build_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
diff --git a/base-image-script/debian-buster_pt3.sh b/base-image-script/debian-buster_pt3.sh
deleted file mode 100644
index 55a2a2b..0000000
--- a/base-image-script/debian-buster_pt3.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2025 fithwum
-# All rights reserved
-set -e
-
-ROOTFS_DIR="${1:-debian-buster}"
-TARBALL="${ROOTFS_DIR}.tar.bz2"
-
-for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
-done
-
-rm -f "$ROOTFS_DIR/root/debian-buster_pt2.sh" 2>/dev/null || true
-
-du -sh "$ROOTFS_DIR"
-
-tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-
-du -sh "$TARBALL"
-
-echo "[INFO] Tarball ready for upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-docker-build_pt1.sh b/base-image-script/debian-docker-build_pt1.sh
index 3900892..8d86941 100644
--- a/base-image-script/debian-docker-build_pt1.sh
+++ b/base-image-script/debian-docker-build_pt1.sh
@@ -8,7 +8,7 @@ DEBIAN_RELEASE="docker-build"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
 SCRIPTS_DIR="base-image-script"
 PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
-PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
+PT3_SCRIPT="debian-build_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
diff --git a/base-image-script/debian-docker-build_pt3.sh b/base-image-script/debian-docker-build_pt3.sh
deleted file mode 100644
index 30370a4..0000000
--- a/base-image-script/debian-docker-build_pt3.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2025 fithwum
-# All rights reserved
-set -e
-
-ROOTFS_DIR="${1:-debian-bookworm}"
-TARBALL="${ROOTFS_DIR}.tar.bz2"
-
-echo "[INFO] Attempting to unmount system directories (ignore errors)..."
-for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
-done
-
-echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/"debian-*_pt2.sh 2>/dev/null || true
-
-echo "[INFO] Rootfs size:"
-du -sh "$ROOTFS_DIR"
-
-echo "[INFO] Creating compressed base image..."
-tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-
-echo "[INFO] Image archive size:"
-du -sh "$TARBALL"
-
-# DO NOT DELETE TARBALL — needed by Gitea Action
-# DO NOT UPLOAD HERE — handled by workflow
-echo "[INFO] Leaving tarball for CI to upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-test_pt1.sh b/base-image-script/debian-test_pt1.sh
index 8f8e056..7755c47 100644
--- a/base-image-script/debian-test_pt1.sh
+++ b/base-image-script/debian-test_pt1.sh
@@ -8,7 +8,7 @@ DEBIAN_RELEASE="bookworm"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
 SCRIPTS_URL="https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/base-image-script/"
 PT2_SCRIPT="debian-test_pt2.sh"
-PT3_SCRIPT="debian-test_pt3.sh"
+PT3_SCRIPT="debian-build_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
diff --git a/base-image-script/debian-test_pt3.sh b/base-image-script/debian-test_pt3.sh
deleted file mode 100644
index f82783e..0000000
--- a/base-image-script/debian-test_pt3.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2025 fithwum
-# All rights reserved
-set -e
-
-ROOTFS_DIR="${1:-debian-bookworm}"
-TARBALL="${ROOTFS_DIR}.tar.bz2"
-
-echo "[INFO] Unmounting system directories..."
-for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir"
-done
-
-echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/debian-base_pt2.sh"
-
-echo "[INFO] Showing rootfs size..."
-du -sh "$ROOTFS_DIR"
-
-echo "[INFO] Creating compressed base image..."
-tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-
-echo "[INFO] Image archive size:"
-du -sh "$TARBALL"
-
-# Optional: Upload via FTP
-# ftp-upload -v -h "$HOST" -u "$USER" --password "$PASS" -d /target/dir "$TARBALL"
-
-echo "[INFO] Cleaning up..."
-rm -rf "$ROOTFS_DIR"
-rm -f "$TARBALL"
-
-echo "[INFO] Done."