fix: only escalate install step in build.sh, build as user
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9569e7c37a
commit
0285a5f37b
2 files changed
+20
-2
No files matched your search
@@ -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
|
||||
Reference in new issue
Block a user