From 7b4d63abbf760e191739174b3940d5c9013082df Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 7 Jul 2025 19:51:46 -0700
Subject: [PATCH] tyhutyuty

---
 .gitea/workflows/base-build.yml | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 3ab659a..73c97ff 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -45,22 +45,26 @@ jobs:
               -v "$(pwd)":/output \
               --env DEBIAN_RELEASE="$version" \
               fithwum/debian-$version-base \
-              bash -euxc '
-                ROOTFS_DIR='debian-${version}'
+              bash -euxo pipefail -c '
+                set -e
 
-                echo '[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs...'
+                ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+
+                echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
                 apt-get update
                 apt-get install -y --no-install-recommends debootstrap bzip2
 
-                debootstrap --verbose --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 \"\$DEBIAN_RELEASE\" \"\$ROOTFS_DIR\" http://deb.debian.org/debian/
+                debootstrap --verbose --variant=minbase --components=main,contrib,non-free \
+                  --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" \
+                  http://deb.debian.org/debian/
 
                 for dir in dev dev/pts proc sys; do
-                  mount --bind \"/\$dir\" \"\$ROOTFS_DIR/\$dir\"
+                  mount --bind "/$dir" "$ROOTFS_DIR/$dir"
                 done
 
-                echo '[CHROOT] Configuring Debian system...'
-                chroot \"\$ROOTFS_DIR\" /bin/bash -c \"
-                  echo 'APT::Get::Assume-Yes \\\"true\\\";' > /etc/apt/apt.conf.d/10-assume_yes
+                echo "[CHROOT] Configuring Debian system..."
+                chroot "$ROOTFS_DIR" /bin/bash -c "
+                  echo 'APT::Get::Assume-Yes \"true\";' > /etc/apt/apt.conf.d/10-assume_yes
                   apt-get update
                   apt-get upgrade
                   apt-get install --no-install-recommends software-properties-common bash wget curl nano locales
@@ -71,19 +75,20 @@ jobs:
                   apt-get clean
                   apt-get install -f
                   find /var/lib/apt/lists/ -type f -delete
-                \"
+                "
 
-                echo '[INFO] Unmounting system directories (ignore errors)...'
+                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
+                  umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
                 done
 
-                mkdir -p /output/$DEBIAN_RELEASE
+                echo "[INFO] Creating compressed base image..."
+                mkdir -p "/output/$DEBIAN_RELEASE"
                 TARBALL="/output/$DEBIAN_RELEASE/debian-${DEBIAN_RELEASE}.tar.bz2"
                 tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-                echo '[INFO] Tarball ready for CI to upload: \$TARBALL'
+                echo "[INFO] Tarball ready for CI to upload: $TARBALL"
               '
-            done
+          done
 
       - name: List output archives
         run: |