From eeaa441cbb0b64702ab850521c287dd7a4af3a87 Mon Sep 17 00:00:00 2001 From: anth64 Date: Tue, 10 Nov 2026 18:56:58 +0100 Subject: [PATCH] Revert "fix: make build.bat install/uninstall just work" This reverts commit 766be55483caff172cf347cc9934895700f143c7. --- CHANGELOG.md | 1 - build.bat | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d21c7cd..1930620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,4 +11,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `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 3265d1a..0096ffb 100644 --- a/build.bat +++ b/build.bat @@ -1,21 +1,4 @@ @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 @@ -25,12 +8,3 @@ 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" -)