From 354d13642ed6590296641fe62265b65006d0f05b Mon Sep 17 00:00:00 2001 From: Jeroen Schepens Date: Sun, 16 Aug 2020 17:48:02 +0200 Subject: [PATCH] Add pamac support --- README.md | 22 ++++++++++++---------- library/aur.py | 5 +++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 8843c20..e49c4ad 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,24 @@ The following helpers are supported and automatically selected, if present, in t - [pacaur](https://github.com/E5ten/pacaur) - [trizen](https://github.com/trizen/trizen) - [pikaur](https://github.com/actionless/pikaur) +- [pamac](https://gitlab.manjaro.org/applications/pamac) - [aurman](https://github.com/polygamma/aurman) (discontinued) *makepkg* will be used if no helper was found or if it is explicitly specified: + - [makepkg](https://wiki.archlinux.org/index.php/makepkg) ## Options -|Parameter |Choices/**Default** |Comments| -|--- |--- |---| -|name | |Name or list of names of the package(s) to install or upgrade.| -|state |**present**, latest |Desired state of the package, 'present' skips operations if the package is already installed.| -|upgrade |yes, **no** |Whether or not to upgrade whole system.| -|use |**auto**, yay, pacaur, trizen, pikaur, aurman, makepkg |The tool to use, 'auto' uses the first known helper found and makepkg as a fallback.| -|extra_args |**null** |A list of additional arguments to pass directly to the tool. Cannot be used in 'auto' mode.| -|aur_only |yes, **no** |Limit helper operation to the AUR.| -|skip_pgp_check |yes, **no** |Only valid with makepkg. Skip PGP signatures verification of source file, useful when installing packages without GnuPG properly configured.| -|ignore_arch |yes, **no** |Only valid with makepkg. Ignore a missing or incomplete arch field, useful when the PKGBUILD does not have the arch=('yourarch') field.| +|Parameter |Choices/**Default** |Comments| +|--- |--- |---| +|name | |Name or list of names of the package(s) to install or upgrade.| +|state |**present**, latest |Desired state of the package, 'present' skips operations if the package is already installed.| +|upgrade |yes, **no** |Whether or not to upgrade whole system.| +|use |**auto**, yay, pacaur, trizen, pikaur, pamac, aurman, makepkg |The tool to use, 'auto' uses the first known helper found and makepkg as a fallback.| +|extra_args |**null** |A list of additional arguments to pass directly to the tool. Cannot be used in 'auto' mode.| +|aur_only |yes, **no** |Limit helper operation to the AUR.| +|skip_pgp_check |yes, **no** |Only valid with makepkg. Skip PGP signatures verification of source file, useful when installing packages without GnuPG properly configured.| +|ignore_arch |yes, **no** |Only valid with makepkg. Ignore a missing or incomplete arch field, useful when the PKGBUILD does not have the arch=('yourarch') field.| ### Note * Either *name* or *upgrade* is required, both cannot be used together. diff --git a/library/aur.py b/library/aur.py index e542232..e5ede7c 100644 --- a/library/aur.py +++ b/library/aur.py @@ -42,7 +42,7 @@ options: description: - The tool to use, 'auto' uses the first known helper found and makepkg as a fallback. default: auto - choices: [ auto, yay, pacaur, trizen, pikaur, aurman, makepkg ] + choices: [ auto, yay, pacaur, trizen, pikaur, pamac, aurman, makepkg ] extra_args: description: @@ -98,11 +98,12 @@ use_cmd = { 'pacaur': ['pacaur', '-S', '--noconfirm', '--noedit', '--needed'], 'trizen': ['trizen', '-S', '--noconfirm', '--noedit', '--needed'], 'pikaur': ['pikaur', '-S', '--noconfirm', '--noedit', '--needed'], + 'pamac': ['pamac', 'install', '--no-confirm'], 'aurman': ['aurman', '-S', '--noconfirm', '--noedit', '--needed', '--skip_news', '--pgp_fetch', '--skip_new_locations'], 'makepkg': ['makepkg', '--syncdeps', '--install', '--noconfirm', '--needed'] } -has_aur_option = ['yay', 'pacaur', 'trizen', 'pikaur', 'aurman'] +has_aur_option = ['yay', 'pacaur', 'trizen', 'pikaur', 'pamac', 'aurman'] def package_installed(module, package):