From fe8983ad711f72fe21010a224863b638ad95bf50 Mon Sep 17 00:00:00 2001 From: kewl fft Date: Sat, 17 Mar 2018 08:15:06 +0000 Subject: [PATCH] add pikaur support --- README.md | 17 +++++++++-------- aur.py | 19 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 18fcc04..6fed291 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,18 @@ 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) - [trizen](https://github.com/trizen/trizen) +- [pikaur](https://github.com/actionless/pikaur) - [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, trizen, pikaur, 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: diff --git a/aur.py b/aur.py index 6419356..85257aa 100644 --- a/aur.py +++ b/aur.py @@ -8,12 +8,15 @@ import os import os.path import tempfile +def_lang = ['env', 'LC_ALL=C'] + use_cmd = { - 'pacaur': ['env', 'LC_ALL=C', 'pacaur', '-S', '--noconfirm', '--noedit', '--needed', '--aur'], - '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'], - 'internal': ['env', 'LC_ALL=C', 'makepkg', '--syncdeps', '--install', '--noconfirm', '--needed'] + 'pacaur': ['pacaur', '-S', '--noconfirm', '--noedit', '--needed', '--aur'], + 'trizen': ['trizen', '-S', '--noconfirm', '--noedit', '--needed', '--aur'], + 'pikaur': ['pikaur', '-S', '--noconfirm', '--noedit', '--needed'], + 'yaourt': ['yaourt', '-S', '--noconfirm', '--needed'], + 'yay': ['yay', '-S', '--noconfirm'], + 'internal': ['makepkg', '--syncdeps', '--install', '--noconfirm', '--needed'] } @@ -47,7 +50,7 @@ def install_internal(module, package): def upgrade(module, use): assert use in use_cmd - rc, out, err = module.run_command(use_cmd[use] + ['-u'], check_rc=True) + rc, out, err = module.run_command(def_lang + use_cmd[use] + ['-u'], check_rc=True) module.exit_json( changed=not (out == '' or 'there is nothing to do' in out or 'No AUR updates found' in out), @@ -69,7 +72,7 @@ def install_packages(module, packages, use, skip_installed): if use == 'internal': rc, out, err = install_internal(module, package) else: - rc, out, err = module.run_command(use_cmd[use] + [package], check_rc=True) + rc, out, err = module.run_command(def_lang + use_cmd[use] + [package], check_rc=True) changed_iter = changed_iter or not (out == '' or '-- skipping' in out or 'there is nothing to do' in out) module.exit_json( @@ -92,7 +95,7 @@ def main(): }, 'use': { 'default': 'auto', - 'choices': ['auto', 'pacaur', 'trizen', 'yaourt', 'yay', 'internal'], + 'choices': ['auto', 'pacaur', 'trizen', 'pikaur', 'yaourt', 'yay', 'internal'], }, 'skip_installed': { 'default': 'no',