From be5f7afb6abcf8f6fdc3fd9ca6aa3358ada2b7b5 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 7 Jul 2025 17:03:32 -0700
Subject: [PATCH] fdghfdgh

---
 .gitea/workflows/base-build.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index e27c532..d180010 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -39,21 +39,22 @@ jobs:
             docker run --rm --privileged \
               -v "$(pwd)":/output \
               fithwum/debian-$version-base \
-              bash -c "
-                set -euo pipefail
-                mkdir -p /output/$version
-                bash base-image-script/debian-${version}_pt1.sh
+              bash -euxo pipefail -c "
+                TARBALL=\"/output/debian-${version}.tar.bz2\"
+                TARGET_DIR=\"/output/${version}\"
+                mkdir -p \"\$TARGET_DIR\"
 
-                TAR=\$(find /output -maxdepth 1 -name 'debian-${version}.tar.bz2' 2>/dev/null | head -n 1)
-                if [[ -f \"\$TAR\" ]]; then
-                  echo \"[INFO] Moving tarball to /output/$version/\"
-                  mv \"\$TAR\" \"/output/$version/\"
-                fi
-
-                if [[ ! -f \"/output/$version/debian-${version}.tar.bz2\" ]]; then
-                  echo \"[ERROR] Expected tarball not found for $version!\"
+                if [ ! -f \"\$TARBALL\" ]; then
+                  echo '[ERROR] Tarball not found at expected path: '\$TARBALL
+                  ls -lh /output || true
                   exit 1
                 fi
+
+                echo \"[INFO] Moving \$TARBALL to \$TARGET_DIR/\"
+                mv \"\$TARBALL\" \"\$TARGET_DIR/\" || { echo '[ERROR] Move failed'; exit 1; }
+
+                echo \"[INFO] Moved tarball to \$TARGET_DIR/\"
+                ls -lh \"\$TARGET_DIR/\"
               "
             echo "[DEBUG] After run: host dir contents:"
             ls -lh "./$version" || echo "[WARN] $version directory missing!"