From 5f04bd23a1858b6400a338f00b73acb28bac6e70 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 29 Jun 2025 22:37:34 +1200
Subject: [PATCH] Update 2 files

---
 dehydrate/build.sh | 37 ++++++++++++++++++++++---------------
 getpkg/build.sh    | 37 ++++++++++++++++++++++---------------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index f58461a..80e7966 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -17,20 +17,27 @@ mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"
 
 # Run build in container with mounted directories
-docker run --rm \
-  --user "$(id -u):$(id -g)" \
-  ${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
-  -v "${SCRIPT_DIR}:/app:ro" \
-  -v "${SCRIPT_DIR}/build:/build" \
-  -v "${SCRIPT_DIR}/output:/output" \
-  -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
-  gitea.jde.nz/public/dropshell-build-base:latest \
-  bash -c "
-    ls -la /app &&
-    cd /build && \
-    cmake -G Ninja -S /app -B . \
+COMMAND_TO_RUN="
+    cmake -G Ninja -S . -B ./build \
       -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
       -DPROJECT_NAME=${PROJECT} && \
-    cmake --build . && \
-    cp ${PROJECT} /output/
-  "
+    cmake --build ./build && \
+    cp ./build/${PROJECT} ./output/
+"
+
+if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
+  echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
+  cd "${SCRIPT_DIR}" && ls -la . && ${COMMAND_TO_RUN}
+else
+  echo "Building in new docker container"
+  docker run --rm \
+    --user "$(id -u):$(id -g)" \
+    -v "${SCRIPT_DIR}:/app:ro" \
+    -v "${SCRIPT_DIR}/build:/app/build" \
+    -v "${SCRIPT_DIR}/output:/app/output" \
+    -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
+    gitea.jde.nz/public/dropshell-build-base:latest \
+    bash -c "cd /app &&${COMMAND_TO_RUN}"
+fi
+
+echo "Build complete"
\ No newline at end of file
diff --git a/getpkg/build.sh b/getpkg/build.sh
index f58461a..80e7966 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -17,20 +17,27 @@ mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"
 
 # Run build in container with mounted directories
-docker run --rm \
-  --user "$(id -u):$(id -g)" \
-  ${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
-  -v "${SCRIPT_DIR}:/app:ro" \
-  -v "${SCRIPT_DIR}/build:/build" \
-  -v "${SCRIPT_DIR}/output:/output" \
-  -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
-  gitea.jde.nz/public/dropshell-build-base:latest \
-  bash -c "
-    ls -la /app &&
-    cd /build && \
-    cmake -G Ninja -S /app -B . \
+COMMAND_TO_RUN="
+    cmake -G Ninja -S . -B ./build \
       -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
       -DPROJECT_NAME=${PROJECT} && \
-    cmake --build . && \
-    cp ${PROJECT} /output/
-  "
+    cmake --build ./build && \
+    cp ./build/${PROJECT} ./output/
+"
+
+if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
+  echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
+  cd "${SCRIPT_DIR}" && ls -la . && ${COMMAND_TO_RUN}
+else
+  echo "Building in new docker container"
+  docker run --rm \
+    --user "$(id -u):$(id -g)" \
+    -v "${SCRIPT_DIR}:/app:ro" \
+    -v "${SCRIPT_DIR}/build:/app/build" \
+    -v "${SCRIPT_DIR}/output:/app/output" \
+    -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
+    gitea.jde.nz/public/dropshell-build-base:latest \
+    bash -c "cd /app &&${COMMAND_TO_RUN}"
+fi
+
+echo "Build complete"
\ No newline at end of file