diff --git a/bootstrap/install_packages.sh b/bootstrap/install_packages.sh index 50a77f3..19a2a6f 100755 --- a/bootstrap/install_packages.sh +++ b/bootstrap/install_packages.sh @@ -36,16 +36,16 @@ main() { exit $ret } -install_yay() { - # check for existing yay installation - if type yay >/dev/null 2>&1; then - echo "Existing yay installation found ..........................................." +install_paru() { + # check for existing paru installation + if type paru >/dev/null 2>&1; then + echo "Existing paru installation found ..........................................." return fi - # use tmp dir to make yay + # use tmp dir to make paru target=$(mktemp -d) - git clone https://aur.archlinux.org/yay.git "$target" + git clone https://aur.archlinux.org/paru.git "$target" cd "$target" || exit makepkg -si } @@ -53,27 +53,27 @@ install_yay() { update_repos() { unattended="$1" if "$unattended"; then - yay -Sqyy --noconfirm + paru -Sqyy --noconfirm else - yay -Syy + paru -Syy fi } install_packages() { unattended="$1" if "$unattended"; then - echo "$packages_repo" "$packages_aur" | yay -Squ --noconfirm --needed - + echo "$packages_repo" "$packages_aur" | paru -Squ --noconfirm --needed - else - echo "$packages_repo" | yay -Squ --needed - - echo "$packages_aur" | yay -S --needed - + echo "$packages_repo" | paru -Squ --needed - + echo "$packages_aur" | paru -S --needed - fi } install() { unattended=$1 echo "Beginning package bootstrap ..............................................." - echo "Installing yay ............................................................" - install_yay + echo "Installing paru ............................................................" + install_paru echo "Installing apps ..........................................................." update_repos "$unattended" install_packages "$unattended"