From 6f5a4f9b6dfb063788661e8613edc5d556d474f3 Mon Sep 17 00:00:00 2001 From: kewl fft Date: Sat, 13 Oct 2018 12:01:48 +0100 Subject: [PATCH] yay positionned #1 and comments refreshed --- README.md | 10 +++++----- aur.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0900116..91678e9 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ Ansible module to use some Arch User Repository (AUR) helpers as well as makepkg. The following helpers are supported and automatically selected in the order they are listed: -- [aurman](https://github.com/polygamma/aurman) - [yay](https://github.com/Jguer/yay) +- [aurman](https://github.com/polygamma/aurman) - [pacaur](https://github.com/rmarquis/pacaur) - [trizen](https://github.com/trizen/trizen) - [pikaur](https://github.com/actionless/pikaur) -makepkg will be used if no helper was found or if it's specified explicitly. +*makepkg* will be used if no helper was found or if it is explicitly specified. - [makepkg](https://wiki.archlinux.org/index.php/makepkg) ## Options @@ -16,7 +16,7 @@ makepkg will be used if no helper was found or if it's specified explicitly. |--- |--- |--- |--- |---| |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, aurman, yay, 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, aurman, pacaur, trizen, pikaur, 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.| |skip_pgp_check |no |no |yes, no |Skip verification of PGP signatures. This is useful when installing packages on a host without GnuPG (properly) configured. Only valid with makepkg.| |aur_only |no |no |yes, no |Limit operation to the AUR. Compatible with yay, aurman, pacaur and trizen.| @@ -39,8 +39,8 @@ git clone https://github.com/kewlfft/ansible-aur.git ~/.ansible/plugins/modules/ ## Usage ### Note -* This module aims to cover the AUR, for package removal or system upgrade with the repositories, it is recommended to use the official *pacman* module, -* A package is reinstalled only if an update is available, using the *--needed* parameter, except for *yay* which does not support it and systematically reinstalls. +* This module aims to cover the AUR; for package removal or system upgrade with the repositories, it is recommended to use the official *pacman* module, +* A package is reinstalled only if an update is available, using the *--needed* parameter. ### Examples Use it in a task, as in the following examples: diff --git a/aur.py b/aur.py index 06cdb92..bf23c5e 100644 --- a/aur.py +++ b/aur.py @@ -34,7 +34,7 @@ options: description: - The helper to use, 'auto' uses the first known helper found and makepkg as a fallback. default: auto - choices: [ auto, aurman, pacaur, trizen, pikaur, yay, makepkg ] + choices: [ auto, yay, aurman, pacaur, trizen, pikaur, makepkg ] skip_installed: description: @@ -76,8 +76,8 @@ EXAMPLES = ''' def_lang = ['env', 'LC_ALL=C'] use_cmd = { - 'aurman': ['aurman', '-S', '--noconfirm', '--noedit', '--needed', '--skip_news', '--pgp_fetch', '--skip_new_locations'], 'yay': ['yay', '-S', '--noconfirm', '--needed'], + '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'],