From b1e90eff90ac81a435df2c4581cf1501627f77f9 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 1 Jun 2025 11:57:56 +1200
Subject: [PATCH] 'Generic Commit'

---
 .gitea/workflows/dropshell-build.yaml | 11 +----------
 dropshell-build/src/dropshell-build   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml
index e990ce4..6afc4a1 100644
--- a/.gitea/workflows/dropshell-build.yaml
+++ b/.gitea/workflows/dropshell-build.yaml
@@ -22,18 +22,9 @@ jobs:
       - name: Build
         run: |
           ./dropshell-build/build.sh
-      - name: Debug Docker Environment
-        run: |
-          echo "PWD: $(pwd)"
-          echo "GITHUB_WORKSPACE: ${GITHUB_WORKSPACE:-not set}"
-          echo "Runner workspace: ${{ github.workspace }}"
-          echo "Docker info:"
-          docker info | grep -E "(Docker Root Dir|Storage Driver)" || true
-          echo "Mount info:"
-          mount | grep -E "(overlay|workspace)" || true
       - name: Test
         run: |
-          HOST_WORKSPACE_PATH="${{ github.workspace }}" ./dropshell-build/test.sh
+          ./dropshell-build/test.sh
       - name: Publish
         run: |
           SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} ./dropshell-build/publish.sh
diff --git a/dropshell-build/src/dropshell-build b/dropshell-build/src/dropshell-build
index a44046e..3263257 100755
--- a/dropshell-build/src/dropshell-build
+++ b/dropshell-build/src/dropshell-build
@@ -196,11 +196,10 @@ function build() {
 }
 
 function buildspawn() {
-    local BUILD_DIR="$1"
-    if [ -z "$BUILD_DIR" ] || [ ! -d "$BUILD_DIR" ]; then
-        echo "Error: builddir doesn't exist: $BUILD_DIR"
-        exit 1
-    fi
+    local BUILD_DIR="${1:-}"
+    [ -n "${BUILD_DIR:-}" ] || die "No Build Directory given!"
+    [ -d "$BUILD_DIR" ] || die "Build Directory doesn't exist: $BUILD_DIR"
+    
     # make canonical
     BUILD_DIR=$(realpath "$BUILD_DIR")
     FLAGS=""
@@ -229,9 +228,10 @@ function buildspawn() {
             echo "--------------------------------"
             
             echo "ls -la using --volumes-from"
-            echo "GITHUB_WORKSPACE: ${GITHUB_WORKSPACE}"
-            echo "BUILD_DIR:        ${BUILD_DIR}"
-            echo "SCRIPT_DIR:       ${SCRIPT_DIR}"
+            echo "GITHUB_WORKSPACE:   ${GITHUB_WORKSPACE}"
+            echo "BUILD_DIR:          ${BUILD_DIR}"
+            echo "PWD:                ${PWD}"
+            echo "JOB_CONTAINER_NAME: ${JOB_CONTAINER_NAME}"
 
             # shellcheck disable=SC2086
             docker run --rm -i --entrypoint /bin/bash \