fix(aur): fall back to yay when paru is unavailable
upgrade, pkg, search, and parur now detect paru first, then yay, and print a clear error if neither is installed. Removes the hard dependency on paru specifically across all AUR-wrapper functions.
This commit is contained in:
+11
-4
@@ -3,16 +3,23 @@
|
||||
|
||||
# Interactively search and remove an installed package using fzf
|
||||
function parur --description 'Interactively search and remove an installed package using fzf'
|
||||
# 1. Use command substitution to get the package list from fzf
|
||||
set -l aur ""
|
||||
if type -q paru
|
||||
set aur paru
|
||||
else if type -q yay
|
||||
set aur yay
|
||||
else
|
||||
echo "No AUR helper found (install paru or yay)" >&2
|
||||
return 1
|
||||
end
|
||||
|
||||
set -l pkg_list (
|
||||
pacman -Qqs \
|
||||
| fzf --preview 'pacman -Qi {}' --multi
|
||||
)
|
||||
|
||||
# 2. Check if a package was selected.
|
||||
if test (count $pkg_list) -gt 0
|
||||
# 3. Pass the selected packages directly to paru -R
|
||||
paru -R $pkg_list
|
||||
$aur -R $pkg_list
|
||||
else
|
||||
echo "No packages selected for removal."
|
||||
end
|
||||
|
||||
+11
-6
@@ -1,10 +1,15 @@
|
||||
# Copyright (C) 2026 Rootiest
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
# Function for installing packages with paru.
|
||||
# This runs `paru` with the `-S` flag to install one or more packages.
|
||||
# The `$argv` variable passes all arguments given to the `pkg` function
|
||||
# directly to the `paru` command.
|
||||
function pkg --wraps='paru' --description 'directly to the `paru` command.'
|
||||
paru -S $argv
|
||||
function pkg --description 'Install packages via paru or yay'
|
||||
set -l aur ""
|
||||
if type -q paru
|
||||
set aur paru
|
||||
else if type -q yay
|
||||
set aur yay
|
||||
else
|
||||
echo "No AUR helper found (install paru or yay)" >&2
|
||||
return 1
|
||||
end
|
||||
$aur -S $argv
|
||||
end
|
||||
|
||||
+11
-6
@@ -1,10 +1,15 @@
|
||||
# Copyright (C) 2026 Rootiest
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
# Function for searching for packages to install with paru.
|
||||
# This runs `paru` with the search flags.
|
||||
# The `$argv` variable passes all arguments given to the `search` function
|
||||
# directly to the `paru` command.
|
||||
function search --wraps='paru' --description 'directly to the `paru` command.'
|
||||
paru $argv
|
||||
function search --description 'Search/install packages interactively via paru or yay'
|
||||
set -l aur ""
|
||||
if type -q paru
|
||||
set aur paru
|
||||
else if type -q yay
|
||||
set aur yay
|
||||
else
|
||||
echo "No AUR helper found (install paru or yay)" >&2
|
||||
return 1
|
||||
end
|
||||
$aur $argv
|
||||
end
|
||||
|
||||
+11
-5
@@ -1,9 +1,15 @@
|
||||
# Copyright (C) 2026 Rootiest
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
# Function for upgrading the system with paru.
|
||||
# This runs `paru` with the `-Syu` flags to sync, refresh, and upgrade all
|
||||
# packages, and adds `--no-confirm` to bypass the confirmation prompt.
|
||||
function upgrade --wraps='paru' --description 'packages, and adds `--no-confirm` to bypass the confirmation prompt.'
|
||||
paru -Syu --noconfirm
|
||||
function upgrade --description 'Full system upgrade via paru or yay'
|
||||
set -l aur ""
|
||||
if type -q paru
|
||||
set aur paru
|
||||
else if type -q yay
|
||||
set aur yay
|
||||
else
|
||||
echo "No AUR helper found (install paru or yay)" >&2
|
||||
return 1
|
||||
end
|
||||
$aur -Syu --noconfirm
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user