From 7eb6f2619a16aee0d0919c8ec07451299e7b1512 Mon Sep 17 00:00:00 2001 From: Plague Doctor Date: Mon, 5 Mar 2018 08:59:26 +1100 Subject: [PATCH] Adding pikaur helper --- README.md | 19 ++++++++++--------- aur.py | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 18fcc04..d190d5c 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ # Ansible AUR package manager Ansible module to use some AUR helpers as well as a simple internal implementation as a fallback. The following helpers are supported and automatically selected in the order they are listed: - [pacaur](https://github.com/rmarquis/pacaur) +- [pikaur](https://github.com/actionless/pikaur) - [trizen](https://github.com/trizen/trizen) - [yaourt](https://github.com/archlinuxfr/yaourt) - [yay](https://github.com/Jguer/yay) - internal helper ## Options -|parameter |required |default |choices |comments| -|--- |--- |--- |--- |---| -|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, pacaur, trizen, yaourt, yay, internal |The helper to use, 'auto' uses the first known helper found, 'internal' uses the internal helper.| -|skip_installed |no |no |yes, no |Skip operations if the package is present.| +|parameter |required |default |choices |comments| +|--- |--- |--- |--- |---| +|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, pacaur, picaur, trizen, yaourt, yay, internal |The helper to use, 'auto' uses the first known helper found, 'internal' uses the internal helper.| +|skip_installed |no |no |yes, no |Skip operations if the package is present.| ### Note * Either *name* or *upgrade* is required, both cannot be used together. @@ -56,7 +57,7 @@ Use it in a task, as in the following examples: use: trizen name: - package_name_1 - - package_name_2 + - package_name_2 [...] # Upgrade - using pacaur @@ -68,7 +69,7 @@ Use it in a task, as in the following examples: While Ansible expects to SSH as root, AUR helpers do not allow executing operations as root, they all fail with "you cannot perform this operation as root". It is therefore recommended to create a user, that we will call for example *aur_builder*, that has no need for password with pacman in sudoers. This can be done in Ansible with the following actions: ``` -- user: +- user: name: aur_builder group: wheel - lineinfile: @@ -76,4 +77,4 @@ This can be done in Ansible with the following actions: line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman' create: yes validate: 'visudo -cf %s' -``` \ No newline at end of file +``` diff --git a/aur.py b/aur.py index 6419356..c94fd5f 100644 --- a/aur.py +++ b/aur.py @@ -10,6 +10,7 @@ import tempfile use_cmd = { 'pacaur': ['env', 'LC_ALL=C', 'pacaur', '-S', '--noconfirm', '--noedit', '--needed', '--aur'], + 'pikaur': ['env', 'LC_ALL=C', 'pacaur', '-S', '--noconfirm', '--noedit', '--needed'], 'trizen': ['env', 'LC_ALL=C', 'trizen', '-S', '--noconfirm', '--noedit', '--needed', '--aur'], 'yaourt': ['env', 'LC_ALL=C', 'yaourt', '-S', '--noconfirm', '--needed'], 'yay': ['env', 'LC_ALL=C', 'yay', '-S', '--noconfirm'], @@ -92,7 +93,7 @@ def main(): }, 'use': { 'default': 'auto', - 'choices': ['auto', 'pacaur', 'trizen', 'yaourt', 'yay', 'internal'], + 'choices': ['auto', 'pacaur', 'pikaur', 'trizen', 'yaourt', 'yay', 'internal'], }, 'skip_installed': { 'default': 'no',