From d27904ec050991024895b7a5b6e97043da944a3b Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Mon, 30 Jun 2025 21:17:31 +1200
Subject: [PATCH] Update 2 files

---
 dehydrate/build.sh | 22 +++++++++++++---------
 getpkg/build.sh    | 22 +++++++++++++---------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index 7c2b22a..94d9551 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -9,10 +9,13 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
 # handle running locally, or docker in docker via gitea runner.
-MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app"
 if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
   echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
-  MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
+  VOLUME_OPTS="--volumes-from=${GITEA_CONTAINER_NAME}"
+  WORKING_DIR="-w ${GITHUB_WORKSPACE}/${PROJECT}"
+else
+  VOLUME_OPTS="-v ${SCRIPT_DIR}:/app"
+  WORKING_DIR="-w /app"
 fi
 
 # Run build in container with mounted directories
@@ -21,13 +24,14 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DPROJECT_NAME=${PROJECT} && \
                 cmake --build ./build" 
 
-  echo "Building in new docker container"
-  docker run --rm \
-    --user "$(id -u):$(id -g)" \
-    "${MOUNT_CMD}" \
-    -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
-    gitea.jde.nz/public/dropshell-build-base:latest \
-    bash -c "${COMMAND_TO_RUN}"
+echo "Building in new docker container"
+docker run --rm \
+  --user "$(id -u):$(id -g)" \
+  "${VOLUME_OPTS}" \
+  "${WORKING_DIR}" \
+  -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
+  gitea.jde.nz/public/dropshell-build-base:latest \
+  bash -c "${COMMAND_TO_RUN}"
 
 [ -f "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found"
 
diff --git a/getpkg/build.sh b/getpkg/build.sh
index 7c2b22a..b95c340 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -9,10 +9,13 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
 # handle running locally, or docker in docker via gitea runner.
-MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app"
 if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
   echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
-  MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
+  VOLUME_OPTS=("--volumes-from=${GITEA_CONTAINER_NAME}")
+  WORKING_DIR=("-w" "${GITHUB_WORKSPACE}/${PROJECT}")
+else
+  VOLUME_OPTS=("-v" "${SCRIPT_DIR}:/app")
+  WORKING_DIR=("-w" "/app")
 fi
 
 # Run build in container with mounted directories
@@ -21,13 +24,14 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DPROJECT_NAME=${PROJECT} && \
                 cmake --build ./build" 
 
-  echo "Building in new docker container"
-  docker run --rm \
-    --user "$(id -u):$(id -g)" \
-    "${MOUNT_CMD}" \
-    -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
-    gitea.jde.nz/public/dropshell-build-base:latest \
-    bash -c "${COMMAND_TO_RUN}"
+echo "Building in new docker container"
+docker run --rm \
+  --user "$(id -u):$(id -g)" \
+  "${VOLUME_OPTS[@]}" \
+  "${WORKING_DIR[@]}" \
+  -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
+  gitea.jde.nz/public/dropshell-build-base:latest \
+  bash -c "${COMMAND_TO_RUN}"
 
 [ -f "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found"