From c726d3dd79d45bbd7b72e9a9d78d7a0c24f04aec Mon Sep 17 00:00:00 2001 From: TrudeEH Date: Mon, 24 Feb 2025 14:11:30 +0000 Subject: [PATCH] Add paru support for p --- install.sh | 9 +++++---- scripts/p.sh | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index de8d9450..4149e17e 100755 --- a/install.sh +++ b/install.sh @@ -79,14 +79,15 @@ programs=(neovim curl git tmux bmon fzf gcc make gpg) if $desktop; then programs+=( - tldr # Simplified man pages - weechat # IRC client + tldr # Simplified man pages + fastfetch # System info + #weechat # IRC client #w3m # Text-based web browser #nnn # File manager #taskwarrior # Task manager #mutt # Email client - #pass-otp # Password manager - #zbar-tools # QR code reader + #pass-otp # Password manager + #zbar-tools # QR code reader ) fi diff --git a/scripts/p.sh b/scripts/p.sh index c87fec3a..d4725e5c 100755 --- a/scripts/p.sh +++ b/scripts/p.sh @@ -30,6 +30,9 @@ pcheck() { if command -v apt >/dev/null 2>&1; then pms+=("apt") elif command -v pacman >/dev/null 2>&1; then + if command -v paru >/dev/null 2>&1; then + pms+=("paru") + fi pms+=("pacman") elif command -v dnf >/dev/null 2>&1; then pms+=("dnf") @@ -63,7 +66,11 @@ p() ( sudo apt autoclean elif [[ ${packageManagers[@]} =~ "pacman" ]]; then sudo sed -i 's/^#ParallelDownloads/ParallelDownloads/' /etc/pacman.conf - sudo pacman -Syu + if [[ ${packageManagers[@]} =~ "paru" ]]; then + paru -Syu + else + sudo pacman -Syu + fi sudo pacman -Rsn $(pacman -Qdtq) if [ ! "$(command -v reflector)" ]; then sudo pacman -Sy --noconfirm reflector rsync curl @@ -155,6 +162,12 @@ p() ( if [[ $? == 0 ]]; then return 0 fi + elif [[ ${packageManagers[@]} =~ "paru" ]]; then + echo "Attempting paru install..." + paru -Sy $1 + if [[ $? == 0 ]]; then + return 0 + fi elif [[ ${packageManagers[@]} =~ "pacman" ]]; then echo "Attempting pacman install..." sudo pacman -Sy $1 @@ -252,6 +265,7 @@ p() ( echo -e "p i package ${FAINT}- install package${ENDCOLOR}" echo -e "p r package ${FAINT}- remove package${ENDCOLOR}" echo -e "p c package ${FAINT}- check if package is installed${ENDCOLOR}" + echo -e "${FAINT}Supported package managers: flatpak, nix, brew, apt, paru, pacman, dnf${ENDCOLOR}" return 1 fi )