From 99bba5c866c0e27ba9214313710a6c1f3e17acc1 Mon Sep 17 00:00:00 2001 From: fbt Date: Thu, 28 Oct 2021 16:48:47 +0300 Subject: [PATCH] do this with a trap Signed-off-by: fbt --- autobuilder/build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/autobuilder/build b/autobuilder/build index 46d59d7..c3112e8 100755 --- a/autobuilder/build +++ b/autobuilder/build @@ -1,6 +1,10 @@ #!/usr/bin/env bash shopt -s nullglob +cleanup() { + chown -R root:root /buildroot +} + # Upgrade pacman -Suy --noconfirm @@ -9,9 +13,12 @@ useradd -U builder builder_uid=$(id -u builder) builder_gid=$(id -g builder) -# gnupg dir permissions +# dir permissions chown -R "$builder_uid:$builder_gid" /.gnupg /buildroot +# Return the permissions on exit +trap cleanup INT TERM EXIT + # Add sudo permissions for pacman to install dependencies printf '%s ALL=(ALL) NOPASSWD: /usr/bin/pacman\n' 'builder' > /etc/sudoers.d/builduser @@ -25,5 +32,4 @@ deps=( ./deps/* ) # Build the damn thing sudo -u builder GNUPGHOME="/.gnupg" makepkg "$@" -# Return the permissions chown -R root:root /buildroot