diff --git a/README.md b/README.md index b3d3329..3500a2a 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ 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) -- [aurman](https://github.com/polygamma/aurman) -- [pacaur](https://github.com/rmarquis/pacaur) +- [pacaur](https://github.com/E5ten/pacaur) - [trizen](https://github.com/trizen/trizen) - [pikaur](https://github.com/actionless/pikaur) +- [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) @@ -16,9 +16,9 @@ The following helpers are supported and automatically selected, if present, in t |--- |--- |--- |--- |---| |name |no | | |Name or list of names of the package(s) to install or upgrade.| |upgrade |no |no |yes, no |Whether or not to upgrade whole system.| -|use |no |auto |auto, yay, aurman, pacaur, trizen, pikaur, makepkg |The helper to use, 'auto' uses the first known helper found and makepkg as a fallback.| +|use |no |auto |auto, yay, pacaur, trizen, pikaur, aurman, makepkg |The helper to use, 'auto' uses the first known helper found and makepkg as a fallback.| |skip_installed |no |no |yes, no |Skip operations if the package is present.| -|aur_only |no |no |yes, no |Limit operation to the AUR. Compatible with yay, aurman, pacaur and trizen.| +|aur_only |no |no |yes, no |Limit operation to the AUR. Compatible with yay, pacaur, aurman and trizen.| |skip_pgp_check |no |no |yes, no |Only valid with makepkg. Skip PGP signatures verification of source file, useful when installing packages without GnuPG properly configured.| |ignore_arch |no |no |yes, no |Only valid with makepkg. Ignore a missing or incomplete arch field, useful when the PKGBUILD does not have the arch=('yourarch') field.| diff --git a/library/aur.py b/library/aur.py index f871cf6..1fc760d 100644 --- a/library/aur.py +++ b/library/aur.py @@ -35,7 +35,7 @@ options: description: - The helper to use, 'auto' uses the first known helper found and makepkg as a fallback. default: auto - choices: [ auto, yay, aurman, pacaur, trizen, pikaur, makepkg ] + choices: [ auto, yay, pacaur, trizen, pikaur, aurman, makepkg ] skip_installed: description: @@ -85,14 +85,14 @@ def_lang = ['env', 'LC_ALL=C'] use_cmd = { 'yay': ['yay', '-S', '--noconfirm', '--needed', '--cleanafter'], - 'aurman': ['aurman', '-S', '--noconfirm', '--noedit', '--needed', '--skip_news', '--pgp_fetch', '--skip_new_locations'], 'pacaur': ['pacaur', '-S', '--noconfirm', '--noedit', '--needed'], 'trizen': ['trizen', '-S', '--noconfirm', '--noedit', '--needed'], 'pikaur': ['pikaur', '-S', '--noconfirm', '--noedit', '--needed'], + 'aurman': ['aurman', '-S', '--noconfirm', '--noedit', '--needed', '--skip_news', '--pgp_fetch', '--skip_new_locations'], 'makepkg': ['makepkg', '--syncdeps', '--install', '--noconfirm', '--needed'] } -has_aur_option = ['yay', 'aurman', 'pacaur', 'trizen'] +has_aur_option = ['yay', 'pacaur', 'trizen', 'aurman'] def package_installed(module, package):