From 5d5cc1e20d052e7ed60d808bc313d83ffbf4a8c2 Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:41:55 -0700 Subject: [PATCH 1/2] Added `paru` as a helper option --- README.md | 3 ++- library/aur.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f873dd6..1ee60ce 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Ansible module to use some Arch User Repository (AUR) helpers as well as makepkg The following helpers are supported and automatically selected, if present, in the order listed below: - [yay](https://github.com/Jguer/yay) +- [paru](https://github.com/Morganamilo/paru) - [pacaur](https://github.com/E5ten/pacaur) - [trizen](https://github.com/trizen/trizen) - [pikaur](https://github.com/actionless/pikaur) @@ -17,7 +18,7 @@ The following helpers are supported and automatically selected, if present, in t |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.| +|use |**auto**, yay, paru, 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.| |local_pkgbuild |Local directory with PKGBUILD, **null** |Only valid with makepkg or pikaur. Don't download the package from AUR. Build the package using a local PKGBUILD and the other build files.| diff --git a/library/aur.py b/library/aur.py index 736774c..b52442d 100644 --- a/library/aur.py +++ b/library/aur.py @@ -43,7 +43,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, paru, pacaur, trizen, pikaur, aurman, makepkg ] extra_args: description: @@ -104,6 +104,7 @@ def_lang = ['env', 'LC_ALL=C'] use_cmd = { 'yay': ['yay', '-S', '--noconfirm', '--needed', '--cleanafter'], + 'paru': ['paru', '-S', '--noconfirm', '--needed', '--cleanafter'], 'pacaur': ['pacaur', '-S', '--noconfirm', '--noedit', '--needed'], 'trizen': ['trizen', '-S', '--noconfirm', '--noedit', '--needed'], 'pikaur': ['pikaur', '-S', '--noconfirm', '--noedit', '--needed'], @@ -116,7 +117,7 @@ use_cmd_local_pkgbuild = { 'makepkg': ['makepkg', '--syncdeps', '--install', '--noconfirm', '--needed'] } -has_aur_option = ['yay', 'pacaur', 'trizen', 'pikaur', 'aurman'] +has_aur_option = ['yay', 'paru', 'pacaur', 'trizen', 'pikaur', 'aurman'] def package_installed(module, package): From 652b11fd76853e00dc60c07985a8e79121ceb6f7 Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Tue, 26 Jan 2021 12:28:14 -0700 Subject: [PATCH 2/2] Alignment adjustment of `Options` table in `README.md` --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1ee60ce..4ced9da 100644 --- a/README.md +++ b/README.md @@ -13,17 +13,17 @@ The following helpers are supported and automatically selected, if present, in t - [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.| +|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, paru, 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.| -|local_pkgbuild |Local directory with PKGBUILD, **null** |Only valid with makepkg or pikaur. Don't download the package from AUR. Build the package using a local PKGBUILD and the other build files.| -|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.| +|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.| +|local_pkgbuild |Local directory with PKGBUILD, **null** |Only valid with makepkg or pikaur. Don't download the package from AUR. Build the package using a local PKGBUILD and the other build files.| +|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.