'Generic Commit'

dropshell-build/src/dropshell-build

@@ -233,26 +233,23 @@ function buildspawn() {
             echo "PWD:                ${PWD}"
             echo "JOB_CONTAINER_NAME: ${JOB_CONTAINER_NAME}"
 
-            # shellcheck disable=SC2086
             docker run --rm -i --entrypoint /bin/bash \
                 --volumes-from="${JOB_CONTAINER_NAME}" \
                 "gitea.jde.nz/public/dropshell-build:${TAG}" \
-                rm -rf /app && \
-                    ln -s "${GITHUB_WORKSPACE}" /app && \
-                    dropshell-build $FLAGS /app
+                bash -c "rm -rf /app && \
+                    ln -s ${GITHUB_WORKSPACE} /app && \
+                    dropshell-build $FLAGS /app"
         else
             echo "Running locally"
-            # shellcheck disable=SC2086
             docker run --rm \
                 -u "$(id -u)":"$(id -g)" \
                 -v "$BUILD_DIR":/app \
                 "gitea.jde.nz/public/dropshell-build:${TAG}" \
-                dropshell-build $FLAGS /app
+                bash -c "dropshell-build $FLAGS /app"
         fi
     else    
         echo "Using local native buildchain"
-        # shellcheck disable=SC2086
-        build $FLAGS "$BUILD_DIR"
+        bash -c "build $FLAGS $BUILD_DIR"
     fi   
 }