From e2e8785ac06d54ea0142dfcd202c58e38402e701 Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 4 Sep 2024 13:56:30 -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/03-files.sh rootfs/root/docker/setup/04-users.sh --- rootfs/root/docker/setup/03-files.sh | 1 + rootfs/root/docker/setup/04-users.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index a1e2a0a..94adf9c 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -27,6 +27,7 @@ exitCode=0 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Main script + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code exitCode=$? diff --git a/rootfs/root/docker/setup/04-users.sh b/rootfs/root/docker/setup/04-users.sh index 75fdc19..12a1b0e 100755 --- a/rootfs/root/docker/setup/04-users.sh +++ b/rootfs/root/docker/setup/04-users.sh @@ -31,6 +31,7 @@ AUR_HOME="${AUR_HOME:-/var/lib/aur}" AUR_BUILD_DIR="${AUR_BUILD_DIR:-${AUR_HOME}/build}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Main script +rm -Rf "$AUR_BUILD_DIR/yay" if ! grep -sq "^$AUR_GROUP:" /etc/group; then echo "Creating group: $AUR_GROUP" groupadd -r -g $AUR_UID $AUR_GROUP @@ -54,7 +55,7 @@ if [ -z "$(command -v yay 2>/dev/null)" ]; then [ -n "$(type -P git)" ] && git config --global init.defaultBranch main chmod -Rf 777 "$AUR_BUILD_DIR" git clone --depth 1 "https://aur.archlinux.org/yay" "." && sudo -u "$AUR_USER" makepkg --noconfirm -si - sudo -u "${AUR_USER}" yay --afterclean --removemake --save && pacman -Qtdq | xargs -r pacman --noconfirm -Rcns + sudo -u "${AUR_USER}" yay --afterclean --removemake --save && pacman -Qtdq | xargs -r pacman --noconfirm -Rcns || exit 1 else exit 1 fi