From 4b59974c02c08b725e7bf4b1a7cd6ed0d2b8f0f1 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 7 Jul 2025 20:50:17 -0700
Subject: [PATCH] dfgdfsg

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

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index be5d7a6..7b9f89e 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -25,7 +25,10 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
-      
+
+      - name: Prepare output directory
+        run: mkdir -p output
+
       - name: Clean workspace tarballs before build
         run: |
           echo "[INFO] Cleaning old tarballs..."
@@ -37,8 +40,6 @@ jobs:
         run: |
           versions=($VERSIONS)
           
-          mkdir -p output
-
           for version in "${versions[@]}"; do
             echo "[INFO] Building $version..."
             docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
@@ -47,7 +48,8 @@ jobs:
               -v "$(pwd)/output":/output \
               -e VERSION="$version" \
               fithwum/debian-$version-base \
-              /scripts/bootstrap-rootfs.sh
+              bash -eux /scripts/bootstrap-rootfs.sh "$version"              
+              # /scripts/bootstrap-rootfs.sh
           done
 
       - name: Debug output folder
@@ -58,9 +60,8 @@ jobs:
 
       - name: List output archives
         run: |
-          echo "[INFO] Final archive list:"
-          find . -type f -path './*/debian-*.tar.bz2' -exec ls -lh {} \;
-
+          echo "[INFO] Looking for tarballs in output/..."
+          find output -name '*.tar.bz2' -exec ls -lh {} \;
 
       # - name: Debug workspace contents
       #   run: |
@@ -87,16 +88,17 @@ jobs:
 
       - name: Copy new archives to upload-repo
         run: |
-          found=$(find . -type f -path './*/debian-*.tar.bz2')
+          found=$(find output -name '*.tar.bz2')
           if [ -z "$found" ]; then
             echo "[WARNING] No .tar.bz2 archive found!"
             exit 1
           fi
 
           for filepath in $found; do
-            version_dir=$(dirname "$filepath")
-            mkdir -p upload-repo/"$version_dir"
-            cp "$filepath" upload-repo/"$version_dir"/
+            filename=$(basename "$filepath")
+            version=$(echo "$filename" | sed -E 's/^debian-([a-z]+)\.tar\.bz2$/\1/')
+            mkdir -p upload-repo/"$version"
+            cp "$filepath" upload-repo/"$version"/
           done
 
       - name: Calculate and store sha256sums in upload-repo