From 05ee2545d11c0a87bffba75e819e35a5d54136be Mon Sep 17 00:00:00 2001 From: developomp Date: Mon, 11 Oct 2021 20:51:50 +0900 Subject: [PATCH] replaced paru with pamac --- setup.sh | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/setup.sh b/setup.sh index 833deb2..95334fe 100755 --- a/setup.sh +++ b/setup.sh @@ -56,30 +56,18 @@ smart_mkdir() { } package_install() { - paru -S --noconfirm "$@" + pamac install --no-confirm "$@" } package_remove() { - paru -R --noconfirm "$@" -} - -install_paru() { - log "installing paru" - - smart_mkdir "$SCRIPT_DIR/tmp" - cd "$SCRIPT_DIR/tmp" || (error "failed to move to $SCRIPT_DIR/tmp for paru installation" && exit 1) - sudo pacman --noconfirm -S --needed base-devel git - git clone https://aur.archlinux.org/paru-bin.git - cd ./paru-bin && makepkg -si - - cd "$SCRIPT_DIR" || (error "failed to come back to working directory after installing paru" && exit 1) + pamac remove --no-confirm "$@" } setup_essentials() { - # install paru if it does not exist - if ! command -v paru &> /dev/null; then - log "paru was not installed already. Installing now..." - install_paru + # install pamac if it does not exist + if ! command -v pamac &> /dev/null; then + log "pamac was not installed already. Installing now..." + setup_pamac fi # install dialog if it's not installed already @@ -495,9 +483,13 @@ setup_pacman() { } setup_pamac() { - package_install \ - pamac_aur `# package manager GUI with AUR support` \ + smart_mkdir "$SCRIPT_DIR/tmp" + cd "$SCRIPT_DIR/tmp" || (error "failed to move to $SCRIPT_DIR/tmp for pamac installation" && exit 1) + sudo pacman --noconfirm -S --needed git + git clone https://aur.archlinux.org/pamac-aur.git + cd ./pamac-aur && makepkg -si + cd "$SCRIPT_DIR" || (error "failed to come back to working directory after installing pamac" && exit 1) } setup_pavucontrol() {