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.
This commit is contained in:
1 parent
429c8a55e7
commit
46a05c0e88
2 files changed
+7
-1
No files matched your search
@@ -10,3 +10,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
### Fixed
|
### Fixed
|
||||||
- `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
|
||||||
@@ -11,6 +11,11 @@ else
|
|||||||
MK_FILE="gmake.mk"
|
MK_FILE="gmake.mk"
|
||||||
fi
|
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
|
if grep -q "Raspberry Pi 5" /proc/device-tree/model 2>/dev/null; then
|
||||||
GL_MAJOR=3
|
GL_MAJOR=3
|
||||||
GL_MINOR=1
|
GL_MINOR=1
|
||||||
@@ -33,7 +38,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" = "0" ]; then
|
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then
|
||||||
PRIV=""
|
PRIV=""
|
||||||
elif command -v doas > /dev/null 2>&1; then
|
elif command -v doas > /dev/null 2>&1; then
|
||||||
PRIV="doas"
|
PRIV="doas"
|
||||||
|
|||||||
Reference in new issue
Block a user