From 99c35a39a327ddf259be5bfc28dacf8ad5b28755 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 6 Sep 2021 17:19:52 -0400 Subject: [PATCH] yay fix? can't test now --- larbs.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/larbs.sh b/larbs.sh index 410b748..db23e2c 100644 --- a/larbs.sh +++ b/larbs.sh @@ -59,7 +59,7 @@ adduserandpass() { \ dialog --infobox "Adding user \"$name\"..." 4 50 useradd -m -g wheel -s /bin/zsh "$name" >/dev/null 2>&1 || usermod -a -G wheel "$name" && mkdir -p /home/"$name" && chown "$name":wheel /home/"$name" - repodir="/home/$name/.local/src"; mkdir -p "$repodir"; chown -R "$name":wheel "$(dirname "$repodir")" + export repodir="/home/$name/.local/src"; mkdir -p "$repodir"; chown -R "$name":wheel "$(dirname "$repodir")" echo "$name:$pass1" | chpasswd unset pass1 pass2 ;} @@ -73,16 +73,15 @@ newperms() { # Set special sudoers settings for install (or after). sed -i "/#LARBS/d" /etc/sudoers echo "$* #LARBS" >> /etc/sudoers ;} -manualinstall() { # Installs $1 manually if not installed. Used only for AUR helper here. - [ -f "/usr/bin/$1" ] || ( +manualinstall() { # Installs $1 manually. Used only for AUR helper here. + # Should be run after repodir is created and var is set. dialog --infobox "Installing \"$1\", an AUR helper..." 4 50 - cd /tmp || exit 1 - rm -rf /tmp/"$1"* - curl -sO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz && - sudo -u "$name" tar -xvf "$1".tar.gz >/dev/null 2>&1 && - cd "$1" && - sudo -u "$name" makepkg --noconfirm -si >/dev/null 2>&1 || return 1 - cd /tmp || return 1) ;} + sudo -u "$name" mkdir -p "$repodir/$1" + sudo -u "$name" git clone --depth 1 "https://aur.archlinux.org/$1.git" "$repodir/$1" >/dev/null 2>&1 || + { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master;} + cd "$repodir/$1" + sudo -u "$name" -D "$repodir/$1" makepkg --noconfirm -si >/dev/null 2>&1 || return 1 +} maininstall() { # Installs all needed programs from main repo. dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 5 70