From b425f1152ec4e3132b54b104a323efbceee9f49d Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 28 Jan 2025 21:45:37 +0100 Subject: [PATCH] fix: LXC leftovers from the runner may belong to root --- forgejo-lib.sh | 6 ++++++ forgejo-runner.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/forgejo-lib.sh b/forgejo-lib.sh index dde57c3..54cb749 100644 --- a/forgejo-lib.sh +++ b/forgejo-lib.sh @@ -5,6 +5,12 @@ set -e export DEBIAN_FRONTEND=noninteractive +function maybe_sudo() { + if test $(id -u) != 0; then + SUDO=sudo + fi +} + : ${RETRY_DELAYS:=1 1 5 5 15 30} function retry() { diff --git a/forgejo-runner.sh b/forgejo-runner.sh index a910e60..94dce04 100755 --- a/forgejo-runner.sh +++ b/forgejo-runner.sh @@ -76,7 +76,8 @@ function setup() { function teardown() { stop_daemon forgejo-runner $DIR if test -f $DIR/forgejo-runner-home; then - rm -fr $(cat $DIR/forgejo-runner-home) + maybe_sudo + $SUDO rm -fr $(cat $DIR/forgejo-runner-home) fi }