Compare commits

...
4 Commits
Author SHA1 Message Date
anth64andClaude Sonnet 5.5 9852249d03 fix: only escalate install step in build.sh, build as user
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-19 23:04:01 +01:00
anth64 a88b87653e fix: install depends on release instead of relying on build.sh order
clean+install in one invocation wiped the release build before install
ran. install now has a real release prerequisite so make's own
dependency graph handles rebuilds regardless of target order; the
redundant manual pre-build in build.sh/build.bat is removed.
2026-11-14 15:41:29 +01:00
anth64 6a09d376c3 fix: build.bat builds release before install
Matches build.sh: running install without release already built
previously just failed or installed stale artifacts.
2026-11-10 18:59:29 +01:00
anth64 978013b4db fix: skip doas/sudo escalation for install under MSYS2
Neither doas nor sudo exist there and id -u never reports root,
so install/uninstall always hit the no-root error. IS_WIN is now
computed once alongside MK_FILE and reused for the priv check.
2026-11-10 18:47:16 +01:00
5 changed files with 29 additions and 5 deletions

No files matched your search

+3
View File
@@ -11,3 +11,6 @@ so entries here track the template's own history, not a game built from it.
### Fixed
- `build.sh`: `uname -s` exported once and reused by make instead of being re-run
- `gmake.mk`: stopped relying on the `OS` env var alone (unset under MSYS2), now also detects Windows via `uname -s` (`MINGW*`/`MSYS*`/`UCRT*`/`CLANG*`/`CYGWIN*`), with the native-Windows `cmd.exe` mkdir/rd path reserved for environments without a POSIX shell; fixes MSYS2 builds silently falling through to the Linux `mkdir -p`/`rm -rf` path mismatch
- `build.sh`: install/uninstall no longer requires `doas`/`sudo` under MSYS2, where neither exists and `id -u` never reports root
- `build.bat`: now builds `release` before `install`, no separate manual build step needed
- `build.sh`: `install`/`uninstall` now only escalate the final install step; other targets (`clean`, etc.) and the release build run as the invoking user, so `build clean install` no longer leaves root-owned `obj/`/`bin/` that break later non-root builds
+1 -1
View File
@@ -124,7 +124,7 @@ ${.CURDIR}/obj/release/server/${_src:S/.c$/.o/}: ${_src}
.-include "obj/release/gl/*.d"
.-include "obj/release/server/*.d"
install:
install: release
install -d ${PREFIX}/bin
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${CLIENT_BIN} ${PREFIX}/bin/${CLIENT_BIN}
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${GLCLIENT_BIN} ${PREFIX}/bin/${GLCLIENT_BIN}
+2
View File
@@ -1,4 +1,6 @@
@echo off
setlocal
if "%1"=="run" (
if "%2"=="" (
make -f gmake.mk run MODE=debug
+22 -3
View File
@@ -11,6 +11,11 @@ else
MK_FILE="gmake.mk"
fi
case "$OS" in
mingw*|msys*|ucrt*|clang*) IS_WIN=1 ;;
*) IS_WIN=0 ;;
esac
if grep -q "Raspberry Pi 5" /proc/device-tree/model 2>/dev/null; then
GL_MAJOR=3
GL_MINOR=1
@@ -29,11 +34,25 @@ for arg in "$@"; do
done
if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
# build as the invoking user; only install/uninstall step runs privileged,
# so obj/ and bin/ never end up root-owned
BUILD_ARGS=""
PRIV_ARGS=""
for arg in "$@"; do
case "$arg" in
install|uninstall) PRIV_ARGS="$PRIV_ARGS $arg" ;;
*) BUILD_ARGS="$BUILD_ARGS $arg" ;;
esac
done
if [ -n "$BUILD_ARGS" ]; then
make -f "$MK_FILE" $BUILD_ARGS GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR || exit 1
fi
if [ "$HAS_INSTALL" = "1" ]; then
make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR || exit 1
fi
if [ "$(id -u)" = "0" ]; then
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then
PRIV=""
elif command -v doas > /dev/null 2>&1; then
PRIV="doas"
@@ -44,7 +63,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
exit 1
fi
$PRIV make -f "$MK_FILE" "$@" GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
$PRIV make -f "$MK_FILE" $PRIV_ARGS GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
elif [ "$1" = "run" ]; then
make -f "$MK_FILE" run GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
elif [ "$1" = "run_gl" ]; then
+1 -1
View File
@@ -174,7 +174,7 @@ obj/release/server/%.o: %.c
-include $(wildcard obj/release/gl/*.d)
-include $(wildcard obj/release/server/*.d)
install:
install: release
install -d $(PREFIX)/bin
install -m 755 $(BIN_DIR)/release/$(CLIENT_BIN) $(PREFIX)/bin/$(CLIENT_BIN)
install -m 755 $(BIN_DIR)/release/$(GLCLIENT_BIN) $(PREFIX)/bin/$(GLCLIENT_BIN)