From 0285a5f37b26e3a91a0f95254650debf54bb6fe9 Mon Sep 17 00:00:00 2001 From: anth64 Date: Thu, 19 Nov 2026 23:04:01 +0100 Subject: [PATCH] fix: only escalate install step in build.sh, build as user Co-Authored-By: Claude Sonnet 5.5 --- CHANGELOG.md | 4 ++++ build.sh | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f28c257..2c2f7d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 taking `create`/`extract`/`list` subcommands (tar-style, with `c`/`x`/`t` aliases). +### Fixed + +- `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 + ## [0.2.0] - 2026-09-16 ### Added diff --git a/build.sh b/build.sh index f14e46a..78c4b1a 100755 --- a/build.sh +++ b/build.sh @@ -18,8 +18,22 @@ 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 || exit 1 + fi if [ "$HAS_INSTALL" = "1" ]; then - make -f "$MK_FILE" release + make -f "$MK_FILE" release || exit 1 fi if [ "$(id -u)" = "0" ]; then @@ -33,7 +47,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then exit 1 fi - $PRIV make -f "$MK_FILE" "$@" + $PRIV make -f "$MK_FILE" $PRIV_ARGS else make -f "$MK_FILE" "$@" fi