From c71cf21b00dc0a40f0b43ecbe51faf6ac81691a4 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 12 Oct 2024 20:44:34 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/root/docker/setup/04-users.sh --- rootfs/root/docker/setup/04-users.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rootfs/root/docker/setup/04-users.sh b/rootfs/root/docker/setup/04-users.sh index 3769be4..302645f 100755 --- a/rootfs/root/docker/setup/04-users.sh +++ b/rootfs/root/docker/setup/04-users.sh @@ -24,7 +24,7 @@ set -o pipefail # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -AUR_UID="9000" +AUR_UID="1000" AUR_USER="${AUR_USER:-aur}" AUR_GROUP="${AUR_GROUP:-$AUR_USER}" AUR_HOME="${AUR_HOME:-/var/lib/aur}" @@ -57,8 +57,9 @@ if [ -z "$(command -v yay 2>/dev/null)" ]; then [ -n "$(type -P git)" ] && git config --global init.defaultBranch main chmod -R 777 "$AUR_BUILD_DIR" git clone --depth 1 "https://aur.archlinux.org/yay-bin" "." && rm -Rf ".git" - sudo -u "$AUR_USER" makepkg -sri --needed --noconfirm -si || exit 1 - sudo -u root bash -c "(yay --afterclean --removemake --save && pacman -Qtdq | xargs -r pacman --noconfirm -Rcns || true)" + sudo -HE -u "$AUR_USER" makepkg -sri --needed --noconfirm -si || exit 1 + sudo -HE -u "$AUR_USER" yay --afterclean --removemake --save --noconfirm && + pacman -Qtdq | xargs -r pacman --noconfirm -Rcns || true [ -d "$AUR_BUILD_DIR" ] && cd && rm -Rf "${AUR_BUILD_DIR:?}"/* "$AUR_HOME/.cache"/* || true else exit 1