diff --git a/getpkg/build.sh b/getpkg/build.sh index 80e7966..3370b9c 100755 --- a/getpkg/build.sh +++ b/getpkg/build.sh @@ -17,13 +17,11 @@ mkdir -p "${SCRIPT_DIR}/build" mkdir -p "${SCRIPT_DIR}/output" # Run build in container with mounted directories -COMMAND_TO_RUN=" - cmake -G Ninja -S . -B ./build \ - -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ - -DPROJECT_NAME=${PROJECT} && \ - cmake --build ./build && \ - cp ./build/${PROJECT} ./output/ -" +COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ + -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ + -DPROJECT_NAME=${PROJECT} && \ + cmake --build ./build && \ + cp ./build/${PROJECT} ./output/" if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}" @@ -37,7 +35,7 @@ else -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}" + bash -c "cd /app && ${COMMAND_TO_RUN}" fi echo "Build complete" \ No newline at end of file