fix addpkg paths
This commit is contained in:
@@ -1,13 +1,13 @@
|
|||||||
---
|
---
|
||||||
- name: "check if task for {{ansible_os_family}}/{{pkg}} exists"
|
- name: "check if task for {{pkg}} exists"
|
||||||
ansible.builtin.command: "test -f {{role_path}}/tasks/pkgs/{{ ansible_os_family }}/{{ pkg }}.yml"
|
ansible.builtin.command: "test -f {{role_path}}/tasks/pkgs/{{ pkg }}.yml"
|
||||||
register: cpkg_exists
|
register: cpkg_exists
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
failed_when: not (cpkg_exists.rc != 0 or cpkg_exists.rc != 1)
|
failed_when: not (cpkg_exists.rc != 0 or cpkg_exists.rc != 1)
|
||||||
|
|
||||||
- name: "add include task for {{ansible_os_family}}/{{pkg}}"
|
- name: "add include task for {{pkg}}"
|
||||||
ansible.builtin.include_tasks:
|
ansible.builtin.include_tasks:
|
||||||
file: "pkgs/{{ ansible_os_family }}/{{ pkg }}.yml"
|
file: "pkgs/{{ pkg }}.yml"
|
||||||
when: cpkg_exists.rc == 0
|
when: cpkg_exists.rc == 0
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
syspkgs: "{{ syspkgs + [pkg] }}"
|
syspkgs: "{{ syspkgs + [pkg] }}"
|
||||||
when:
|
when:
|
||||||
- cpkg_exists.rc == 1
|
- cpkg_exists.rc != 0
|
||||||
- assume_missing_is_syspkg
|
- assume_missing_is_syspkg
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
# variables used in ansible_role_package
|
# variables used in ansible_role_package
|
||||||
---
|
---
|
||||||
packages: []
|
|
||||||
syspkgs: []
|
|
||||||
srcpkgs: []
|
|
||||||
caskpkgs: []
|
|
||||||
cargopkgs: []
|
|
||||||
npmpkgs: []
|
|
||||||
gopkgs: []
|
|
||||||
pipxpkgs: []
|
|
||||||
assume_missing_is_syspkg: false
|
assume_missing_is_syspkg: false
|
||||||
install_state: present
|
|
||||||
full_upgrade: false
|
full_upgrade: false
|
||||||
_ghbase: "https://github.com"
|
install_state: present
|
||||||
|
|
||||||
|
# install lists
|
||||||
|
brewtaps: []
|
||||||
|
cargopkgs: []
|
||||||
|
caskpkgs: []
|
||||||
|
gopkgs: []
|
||||||
|
npmpkgs: []
|
||||||
|
packages: []
|
||||||
|
pipxpkgs: []
|
||||||
|
srcpkgs: []
|
||||||
|
syspkgs: []
|
||||||
|
|||||||
Reference in New Issue
Block a user