From b5c664f15c1992fdeb21c5c3c6a29e71bd6901b3 Mon Sep 17 00:00:00 2001 From: anth64 Date: Tue, 10 Nov 2026 18:55:08 +0100 Subject: [PATCH] fix: make build.bat install/uninstall just work Build release first like build.sh does, and self-elevate via UAC (powershell Start-Process -Verb RunAs) instead of requiring an already-elevated shell. --- CHANGELOG.md | 1 + build.bat | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d755c55..e80c77c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,3 +12,4 @@ so entries here track the template's own history, not a game built from it. - `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` (matching `build.sh`) and self-elevates via UAC for `install`/`uninstall` instead of requiring an already-elevated shell diff --git a/build.bat b/build.bat index 3384c4a..e015390 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,21 @@ @echo off +setlocal + +set HAS_INSTALL=0 +set HAS_UNINSTALL=0 +for %%a in (%*) do ( + if "%%a"=="install" set HAS_INSTALL=1 + if "%%a"=="uninstall" set HAS_UNINSTALL=1 +) + +if "%HAS_INSTALL%"=="1" ( + make -f gmake.mk release + if errorlevel 1 exit /b 1 +) + +if "%HAS_INSTALL%"=="1" goto :elevate +if "%HAS_UNINSTALL%"=="1" goto :elevate + if "%1"=="run" ( if "%2"=="" ( make -f gmake.mk run MODE=debug @@ -14,3 +31,12 @@ if "%1"=="run" ( ) else ( make -f gmake.mk %* ) +goto :eof + +:elevate +net session >nul 2>&1 +if %errorlevel%==0 ( + make -f gmake.mk %* +) else ( + powershell -NoProfile -Command "Start-Process -FilePath '%~f0' -ArgumentList '%*' -Verb RunAs -Wait" +)