Revert "fix: make build.bat install/uninstall just work"
This reverts commit 766be55483.
This commit is contained in:
1 parent
766be55483
commit
eeaa441cbb
2 files changed
-27
No files matched your search
@@ -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
|
- `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
|
- `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.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
|
|
||||||
@@ -1,21 +1,4 @@
|
|||||||
@echo off
|
@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 "%1"=="run" (
|
||||||
if "%2"=="" (
|
if "%2"=="" (
|
||||||
make -f gmake.mk run MODE=debug
|
make -f gmake.mk run MODE=debug
|
||||||
@@ -25,12 +8,3 @@ if "%1"=="run" (
|
|||||||
) else (
|
) else (
|
||||||
make -f gmake.mk %*
|
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"
|
|
||||||
)
|
|
||||||
Reference in new issue
Block a user