From 854044229c726f57aa73a3b81e36eca65d940ec3 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Thu, 25 Jul 2024 15:44:51 -0600 Subject: [PATCH] reduce reliance on sudo --- core/build-containerbox.sh | 5 +---- core/build-registrybox.sh | 5 +---- core/build-startbox.sh | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/core/build-containerbox.sh b/core/build-containerbox.sh index f988d2de3..e4a8f6e7a 100755 --- a/core/build-containerbox.sh +++ b/core/build-containerbox.sh @@ -28,15 +28,12 @@ set +e fail= echo "FEATURES=\"$FEATURES\"" echo "RUSTFLAGS=\"$RUSTFLAGS\"" -if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl)"; then +if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then fail=true fi set -e cd core -sudo chown -R $USER target -sudo chown -R $USER ~/.cargo - if [ -n "$fail" ]; then exit 1 fi diff --git a/core/build-registrybox.sh b/core/build-registrybox.sh index 9928b6714..9db57dd80 100755 --- a/core/build-registrybox.sh +++ b/core/build-registrybox.sh @@ -28,15 +28,12 @@ set +e fail= echo "FEATURES=\"$FEATURES\"" echo "RUSTFLAGS=\"$RUSTFLAGS\"" -if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl)"; then +if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then fail=true fi set -e cd core -sudo chown -R $USER target -sudo chown -R $USER ~/.cargo - if [ -n "$fail" ]; then exit 1 fi diff --git a/core/build-startbox.sh b/core/build-startbox.sh index 0604ba5da..55a455f09 100755 --- a/core/build-startbox.sh +++ b/core/build-startbox.sh @@ -28,15 +28,12 @@ set +e fail= echo "FEATURES=\"$FEATURES\"" echo "RUSTFLAGS=\"$RUSTFLAGS\"" -if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then +if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then fail=true fi set -e cd core -sudo chown -R $USER target -sudo chown -R $USER ~/.cargo - if [ -n "$fail" ]; then exit 1 fi