This commit is contained in:
Luke Smith 2022-06-28 09:41:32 -04:00
parent b513b1769b
commit 8f62521383

View File

@ -98,7 +98,7 @@ manualinstall() { # Installs $1 manually. Used only for AUR helper here.
dialog --infobox "Installing \"$1\", an AUR helper..." 4 50 dialog --infobox "Installing \"$1\", an AUR helper..." 4 50
sudo -u "$name" mkdir -p "$repodir/$1" sudo -u "$name" mkdir -p "$repodir/$1"
sudo -u "$name" gitclonefast "https://aur.archlinux.org/$1.git" "$repodir/$1" \ sudo -u "$name" gitclonefast "https://aur.archlinux.org/$1.git" "$repodir/$1" \
|| { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master;} || { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master ;}
cd "$repodir/$1" || exit 1 cd "$repodir/$1" || exit 1
sudo -u "$name" -D "$repodir/$1" makepkg --noconfirm -si >/dev/null 2>&1 || return 1 sudo -u "$name" -D "$repodir/$1" makepkg --noconfirm -si >/dev/null 2>&1 || return 1
} }
@ -112,7 +112,7 @@ gitmakeinstall() {
progname="$(basename "$1" .git)" progname="$(basename "$1" .git)"
dir="$repodir/$progname" dir="$repodir/$progname"
dialog --title "LARBS Installation" --infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70
sudo -u "$name" gitclonefast "$1" "$dir" || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master;} sudo -u "$name" gitclonefast "$1" "$dir" || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;}
cd "$dir" || exit 1 cd "$dir" || exit 1
make >/dev/null 2>&1 make >/dev/null 2>&1
make install >/dev/null 2>&1 make install >/dev/null 2>&1