diff --git a/tasks/pkgs/choose.yml b/tasks/pkgs/choose.yml index 699df35..c8102d0 100644 --- a/tasks/pkgs/choose.yml +++ b/tasks/pkgs/choose.yml @@ -12,10 +12,13 @@ methods: Archlinux: [system, source] default: [source] + pkgname: + default: choose - name: Finalise choose default facts ansible.builtin.set_fact: choose: - methods: "{{ choose.methods[os_family] | default(choose.methods.defualt) }}" + methods: "{{ choose.methods[os_family] | default(choose.methods.default) }}" + pkgname: "{{ choose.pkgname[os_family] | default(choose.methods.default)}}" version: 1.3.7 # }}} - name: Configure choose @@ -28,6 +31,15 @@ ansible.builtin.set_fact: choose_imethod: "{{ imethod if imethod in choose.methods else choose.methods[0] }}" + - name: Configure choose system install + when: + - choose_imethod == 'system' + block: + - name: Queue choose system install + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + [choose.pkgname] }}" + choose_install: "{{ choose_imethod }}={{ choose.pkgname }}" + - name: Configure choose source install when: - choose_imethod == 'source' @@ -41,9 +53,6 @@ - name: Append choose to pkg_cargo ansible.builtin.set_fact: pkg_cargo: "{{ pkg_cargo + [choose_cargo_install] }}" - - - name: Finalise choose cargo install - ansible.builtin.set_fact: choose_install: "{{ choose_imethod }}={{ choose_cargo_install }}" - name: Finalise choose configuration