13 Commits

Author SHA1 Message Date
kewl fft
7285f5aaaa correct version tag 2021-11-04 21:34:04 +00:00
kewl fft
cda508cfc0 correct version tag 2021-11-04 21:30:30 +00:00
kewl
c8bf68a91b Merge pull request #63 from assapir/master
Add support for refresh package
2021-11-01 17:41:27 +00:00
Assaf Sapir
2319468c2e use update_cache 2021-10-22 12:23:07 +03:00
Assaf Sapir
f12cb1b36b Fix parameter 2021-10-21 19:49:24 +03:00
Assaf Sapir
e8108fe3e4 Fix parameter 2021-10-21 19:44:02 +03:00
Assaf Sapir
472a92ff8e fix bug and update version 2021-10-19 20:59:14 +03:00
Assaf Sapir
b3e47d6395 Add support for refresh package 2021-10-19 20:48:51 +03:00
kewl fft
47fbee75b9 version bump 2021-09-04 08:55:14 +01:00
kewl
a19f5db22a Merge pull request #62 from gotmax23/patch-2
Fix spelling error in README
2021-09-04 08:42:34 +01:00
kewl
8cf53bd930 Merge pull request #61 from gotmax23/patch-1
Add direct link to AUR package
2021-09-04 08:42:03 +01:00
Maxwell G
095a450558 Fix spelling error in README
This commit fixes a spelling mistake that I made.
2021-09-03 16:27:23 -05:00
Maxwell G
de8f8ef272 Add direct link to AUR package
I just pushed `ansible-collection-kewlfft-aur` to the AUR, so I added a direct link to it in the README.
2021-09-03 16:05:45 -05:00
3 changed files with 24 additions and 11 deletions

View File

@@ -23,7 +23,7 @@ collections:
### Install the `kewlfft.aur` collection from the AUR
The `kewlfft.aur` collection is also available in the AUR as the `ansible-collection-kewlfft-aur` package.
The `kewlfft.aur` collection is also available in the AUR as the [`ansible-collection-kewlfft-aur`](https://aur.archlinux.org/packages/ansible-collection-kewlfft-aur/) package.
### Install the `kewlfft.aur` collection locally for development
@@ -69,6 +69,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. |
| update_cache | yes, **no** | Whether or not to refresh the packages cache |
| 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. |
@@ -113,7 +114,7 @@ This user can be created in an Ansible task with the following actions:
In order to use an Ansible module that is distributed in a collection, you must use its FQCN. This corresponds to "the full definition of a module, plugin, or role hosted within a collection, in the form `namespace.collection.content_name`" ([Source](https://github.com/ansible-collections/overview#terminology)). In this case, the `aur` module resides in the `aur` collection which is under the `kewlfft` namespace, so its FQCN is `kewlfft.aur.aur`.
Please note that this does not apply if you installed the `aur` module as a local custom module. Do to the nature of local custom modules, you can simply use the module's short name: `aur`.
Please note that this does not apply if you installed the `aur` module as a local custom module. Due to the nature of local custom modules, you can simply use the module's short name: `aur`.
#### Examples

View File

@@ -8,7 +8,7 @@ namespace: kewlfft
name: aur
# The version of the collection. Must be compatible with semantic versioning
version: 0.9.0
version: 0.9.3
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
@@ -66,4 +66,3 @@ issues: https://github.com/kewlfft/ansible-aur/issues
# uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry',
# and '.git' are always filtered
build_ignore: []

View File

@@ -39,6 +39,12 @@ options:
default: no
type: bool
update_cache:
description:
- Whether or not to update_cache the package cache.
default: no
type: bool
use:
description:
- The tool to use, 'auto' uses the first known helper found and makepkg as a fallback.
@@ -160,7 +166,7 @@ def check_packages(module, packages):
module.exit_json(changed=status, msg=message, diff=diff)
def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=False, aur_only=False, local_pkgbuild=None):
def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=False, aur_only=False, local_pkgbuild=None, update_cache=False):
"""
Create the prefix of a command that can be used by the install and upgrade functions.
"""
@@ -176,6 +182,8 @@ def build_command_prefix(use, extra_args, skip_pgp_check=False, ignore_arch=Fals
command.append('--aur')
if local_pkgbuild and use != 'makepkg':
command.append(local_pkgbuild)
if update_cache:
command.append('-y')
if extra_args:
command += shlex.split(extra_args)
return command
@@ -232,13 +240,13 @@ def check_upgrade(module, use):
)
def upgrade(module, use, extra_args, aur_only):
def upgrade(module, use, extra_args, aur_only, update_cache):
"""
Upgrade the whole system
"""
assert use in use_cmd
command = build_command_prefix(use, extra_args, aur_only=aur_only)
command = build_command_prefix(use, extra_args, aur_only=aur_only, update_cache=update_cache)
command.append('-u')
rc, out, err = module.run_command(command, check_rc=True)
@@ -250,7 +258,7 @@ def upgrade(module, use, extra_args, aur_only):
)
def install_packages(module, packages, use, extra_args, state, skip_pgp_check, ignore_arch, aur_only, local_pkgbuild):
def install_packages(module, packages, use, extra_args, state, skip_pgp_check, ignore_arch, aur_only, local_pkgbuild, update_cache):
"""
Install the specified packages
"""
@@ -271,7 +279,7 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i
elif local_pkgbuild:
rc, out, err = install_local_package(module, package, use, extra_args, local_pkgbuild)
else:
command = build_command_prefix(use, extra_args, aur_only=aur_only)
command = build_command_prefix(use, extra_args, aur_only=aur_only, update_cache=update_cache)
command.append(package)
rc, out, err = module.run_command(command, check_rc=True)
@@ -300,6 +308,10 @@ def make_module():
'upgrade': {
'type': 'bool',
},
'update_cache': {
'default': False,
'type': 'bool',
},
'use': {
'default': 'auto',
'choices': ['auto'] + list(use_cmd.keys()),
@@ -372,7 +384,7 @@ def apply_module(module, use):
if module.check_mode:
check_upgrade(module, use)
else:
upgrade(module, use, params['extra_args'], params['aur_only'])
upgrade(module, use, params['extra_args'], params['aur_only'], params['update_cache'])
else:
if module.check_mode:
check_packages(module, params['name'])
@@ -385,7 +397,8 @@ def apply_module(module, use):
params['skip_pgp_check'],
params['ignore_arch'],
params['aur_only'],
params['local_pkgbuild'])
params['local_pkgbuild'],
params['update_cache'])
def main():