From a34e9626a6a167fd807b504ae4a632b760ea23ed Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 7 Jul 2025 18:01:14 -0700
Subject: [PATCH] update

---
 .gitea/workflows/base-build.yml               |  2 +-
 ...bookworm_pt1.sh => debian-bookworm-pt1.sh} | 14 +++---
 ...ebian-build_pt2.sh => debian-build-pt2.sh} |  0
 ...ebian-build_pt3.sh => debian-build-pt3.sh} |  4 +-
 ...bullseye_pt1.sh => debian-bullseye-pt1.sh} | 14 +++---
 ...ian-buster_pt1.sh => debian-buster-pt1.sh} | 14 +++---
 ...uild_pt1.sh => debian-docker-build-pt1.sh} | 14 +++---
 ...uild_pt2.sh => debian-docker-build-pt2.sh} |  0
 base-image-script/debian-test_pt1.sh          | 48 -------------------
 ...ian-trixie_pt1.sh => debian-trixie-pt1.sh} | 14 +++---
 10 files changed, 38 insertions(+), 86 deletions(-)
 rename base-image-script/{debian-bookworm_pt1.sh => debian-bookworm-pt1.sh} (70%)
 rename base-image-script/{debian-build_pt2.sh => debian-build-pt2.sh} (100%)
 rename base-image-script/{debian-build_pt3.sh => debian-build-pt3.sh} (88%)
 rename base-image-script/{debian-bullseye_pt1.sh => debian-bullseye-pt1.sh} (70%)
 rename base-image-script/{debian-buster_pt1.sh => debian-buster-pt1.sh} (70%)
 rename base-image-script/{debian-docker-build_pt1.sh => debian-docker-build-pt1.sh} (69%)
 rename base-image-script/{debian-docker-build_pt2.sh => debian-docker-build-pt2.sh} (100%)
 delete mode 100644 base-image-script/debian-test_pt1.sh
 rename base-image-script/{debian-trixie_pt1.sh => debian-trixie-pt1.sh} (70%)

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 985d6d3..f72e5d8 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -44,7 +44,7 @@ jobs:
             docker run --rm --privileged \
               -v "$(pwd)":/output \
               fithwum/debian-$version-base \
-              bash base-image-script/debian-${version}_pt1.sh
+              bash base-image-script/debian-${version}-pt1.sh
 
             TARBALL="debian-${version}.tar.bz2"
             if [ -f "$TARBALL" ]; then
diff --git a/base-image-script/debian-bookworm_pt1.sh b/base-image-script/debian-bookworm-pt1.sh
similarity index 70%
rename from base-image-script/debian-bookworm_pt1.sh
rename to base-image-script/debian-bookworm-pt1.sh
index cc7cab8..9db09aa 100644
--- a/base-image-script/debian-bookworm_pt1.sh
+++ b/base-image-script/debian-bookworm-pt1.sh
@@ -5,10 +5,10 @@ set -e
 set -o pipefail
 
 DEBIAN_RELEASE="bookworm"
-ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+ROOTFS_DIR="debian-$DEBIAN_RELEASE"
 SCRIPTS_DIR="base-image-script"
-PT2_SCRIPT="debian-build_pt2.sh"
-PT3_SCRIPT="debian-build_pt3.sh"
+PT2_SCRIPT="debian-build-pt2.sh"
+PT3_SCRIPT="debian-build-pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
@@ -16,8 +16,8 @@ apt-get upgrade -y
 apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr bzip2
 
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
-        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+    if [ ! -f "./$SCRIPTS_DIR/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: $SCRIPTS_DIR/$SCRIPT"
         exit 1
     fi
 done
@@ -29,9 +29,9 @@ for dir in dev dev/pts proc sys; do
     mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./$SCRIPTS_DIR/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
+bash "./$SCRIPTS_DIR/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-build_pt2.sh b/base-image-script/debian-build-pt2.sh
similarity index 100%
rename from base-image-script/debian-build_pt2.sh
rename to base-image-script/debian-build-pt2.sh
diff --git a/base-image-script/debian-build_pt3.sh b/base-image-script/debian-build-pt3.sh
similarity index 88%
rename from base-image-script/debian-build_pt3.sh
rename to base-image-script/debian-build-pt3.sh
index 140896f..adbad76 100644
--- a/base-image-script/debian-build_pt3.sh
+++ b/base-image-script/debian-build-pt3.sh
@@ -14,7 +14,7 @@ else
     fi
 fi
 
-TARBALL="/output/${ROOTFS_DIR}.tar.bz2"
+TARBALL="/output/$ROOTFS_DIR.tar.bz2"
 
 echo "[INFO] Unmounting system directories (ignore errors)..."
 for dir in sys proc dev/pts dev; do
@@ -22,7 +22,7 @@ for dir in sys proc dev/pts dev; do
 done
 
 echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/${ROOTFS_DIR}_pt2.sh" 2>/dev/null || true
+rm -f "$ROOTFS_DIR/root/$ROOTFS_DIR_pt2.sh" 2>/dev/null || true
 
 echo "[INFO] Rootfs size:"
 du -sh "$ROOTFS_DIR"
diff --git a/base-image-script/debian-bullseye_pt1.sh b/base-image-script/debian-bullseye-pt1.sh
similarity index 70%
rename from base-image-script/debian-bullseye_pt1.sh
rename to base-image-script/debian-bullseye-pt1.sh
index 01b5d99..248b149 100644
--- a/base-image-script/debian-bullseye_pt1.sh
+++ b/base-image-script/debian-bullseye-pt1.sh
@@ -5,10 +5,10 @@ set -e
 set -o pipefail
 
 DEBIAN_RELEASE="bullseye"
-ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+ROOTFS_DIR="debian-$DEBIAN_RELEASE"
 SCRIPTS_DIR="base-image-script"
-PT2_SCRIPT="debian-build_pt2.sh"
-PT3_SCRIPT="debian-build_pt3.sh"
+PT2_SCRIPT="debian-build-pt2.sh"
+PT3_SCRIPT="debian-build-pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
@@ -16,8 +16,8 @@ apt-get upgrade -y
 apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr bzip2
 
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
-        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+    if [ ! -f "./$SCRIPTS_DIR/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: $SCRIPTS_DIR/$SCRIPT"
         exit 1
     fi
 done
@@ -29,9 +29,9 @@ for dir in dev dev/pts proc sys; do
     mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./$SCRIPTS_DIR/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
+bash "./$SCRIPTS_DIR/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-buster_pt1.sh b/base-image-script/debian-buster-pt1.sh
similarity index 70%
rename from base-image-script/debian-buster_pt1.sh
rename to base-image-script/debian-buster-pt1.sh
index 120b4ee..b3fb763 100644
--- a/base-image-script/debian-buster_pt1.sh
+++ b/base-image-script/debian-buster-pt1.sh
@@ -5,10 +5,10 @@ set -e
 set -o pipefail
 
 DEBIAN_RELEASE="buster"
-ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+ROOTFS_DIR="debian-$DEBIAN_RELEASE"
 SCRIPTS_DIR="base-image-script"
-PT2_SCRIPT="debian-build_pt2.sh"
-PT3_SCRIPT="debian-build_pt3.sh"
+PT2_SCRIPT="debian-build-pt2.sh"
+PT3_SCRIPT="debian-build-pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
@@ -16,8 +16,8 @@ apt-get upgrade -y
 apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr bzip2
 
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
-        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+    if [ ! -f "./$SCRIPTS_DIR/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: $SCRIPTS_DIR/$SCRIPT"
         exit 1
     fi
 done
@@ -29,9 +29,9 @@ for dir in dev dev/pts proc sys; do
     mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./$SCRIPTS_DIR/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
+bash "./$SCRIPTS_DIR/$PT3_SCRIPT" "$ROOTFS_DIR"
\ 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
similarity index 69%
rename from base-image-script/debian-docker-build_pt1.sh
rename to base-image-script/debian-docker-build-pt1.sh
index 8d86941..55f4c4a 100644
--- a/base-image-script/debian-docker-build_pt1.sh
+++ b/base-image-script/debian-docker-build-pt1.sh
@@ -5,10 +5,10 @@ set -e
 set -o pipefail
 
 DEBIAN_RELEASE="docker-build"
-ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+ROOTFS_DIR="debian-$DEBIAN_RELEASE"
 SCRIPTS_DIR="base-image-script"
-PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
-PT3_SCRIPT="debian-build_pt3.sh"
+PT2_SCRIPT="debian-$DEBIAN_RELEASE-pt2.sh"
+PT3_SCRIPT="debian-build-pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
@@ -16,8 +16,8 @@ apt-get upgrade -y
 apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr bzip2
 
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
-        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+    if [ ! -f "./$SCRIPTS_DIR/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: $SCRIPTS_DIR/$SCRIPT"
         exit 1
     fi
 done
@@ -29,9 +29,9 @@ for dir in dev dev/pts proc sys; do
     mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./$SCRIPTS_DIR/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
+bash "./$SCRIPTS_DIR/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-docker-build_pt2.sh b/base-image-script/debian-docker-build-pt2.sh
similarity index 100%
rename from base-image-script/debian-docker-build_pt2.sh
rename to base-image-script/debian-docker-build-pt2.sh
diff --git a/base-image-script/debian-test_pt1.sh b/base-image-script/debian-test_pt1.sh
deleted file mode 100644
index ae2c24c..0000000
--- a/base-image-script/debian-test_pt1.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2025 fithwum
-# All rights reserved
-set -e
-set -o pipefail
-
-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-build_pt2.sh"
-PT3_SCRIPT="debian-build_pt3.sh"
-
-echo "[INFO] Preparing environment..."
-apt-get update -y
-apt-get upgrade -y
-apt-get install -y --no-install-recommends debootstrap bash curl wget ftp-upload dirmngr
-
-echo "[INFO] Downloading extra scripts if missing..."
-for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./$SCRIPT" ]; then
-        echo "[INFO] Downloading $SCRIPT..."
-        wget --no-cache "$SCRIPTS_URL/$SCRIPT" -O "./$SCRIPT"
-        chmod +x "./$SCRIPT"
-    fi
-done
-
-echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE..."
-debootstrap \
-  --variant=minbase \
-  --components=main,contrib,non-free \
-  --include=apt,ca-certificates \
-  --arch=amd64 \
-  "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/
-
-echo "[INFO] Mounting system directories..."
-for dir in dev dev/pts proc sys; do
-    mount --bind /$dir "$ROOTFS_DIR/$dir"
-done
-
-echo "[INFO] Copying pt2 script into chroot..."
-cp "./$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
-chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
-
-echo "[INFO] Entering chroot. Type 'exit' when done."
-chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
-
-echo "[INFO] Running pt3 for packaging and upload..."
-./$PT3_SCRIPT "$ROOTFS_DIR"
diff --git a/base-image-script/debian-trixie_pt1.sh b/base-image-script/debian-trixie-pt1.sh
similarity index 70%
rename from base-image-script/debian-trixie_pt1.sh
rename to base-image-script/debian-trixie-pt1.sh
index 8d76248..03620e5 100644
--- a/base-image-script/debian-trixie_pt1.sh
+++ b/base-image-script/debian-trixie-pt1.sh
@@ -5,10 +5,10 @@ set -e
 set -o pipefail
 
 DEBIAN_RELEASE="trixie"
-ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+ROOTFS_DIR="debian-$DEBIAN_RELEASE"
 SCRIPTS_DIR="base-image-script"
-PT2_SCRIPT="debian-build_pt2.sh"
-PT3_SCRIPT="debian-build_pt3.sh"
+PT2_SCRIPT="debian-build-pt2.sh"
+PT3_SCRIPT="debian-build-pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
@@ -16,8 +16,8 @@ apt-get upgrade -y
 apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr bzip2
 
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
-        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+    if [ ! -f "./$SCRIPTS_DIR/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: $SCRIPTS_DIR/$SCRIPT"
         exit 1
     fi
 done
@@ -29,9 +29,9 @@ for dir in dev dev/pts proc sys; do
     mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./$SCRIPTS_DIR/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
+bash "./$SCRIPTS_DIR/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file