adjusting variable names, fixing errors
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
- "{{ path_bin }}"
|
||||
- "{{ path_cargo }}"
|
||||
- "{{ path_source }}"
|
||||
- "{{ path_pipx }}"
|
||||
- "{{ path_zig }}"
|
||||
loop_control:
|
||||
loop_var: path
|
||||
ansible.builtin.file:
|
||||
@@ -66,39 +66,6 @@
|
||||
ansible.builtin.include_tasks:
|
||||
file: "pkgs/{{ pkg }}.yml"
|
||||
|
||||
- name: Ensure pipx is installed
|
||||
when:
|
||||
- pkg_pipx|length > 0
|
||||
block:
|
||||
- name: Ensure pipx path exists
|
||||
become: "{{ install_become }}"
|
||||
become_user: "{{ install_become_user }}"
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
mode: '0755'
|
||||
path: "{{ path_pipx }}"
|
||||
|
||||
- name: Ensure appimage path exists
|
||||
when:
|
||||
- pkg_appimage is defined
|
||||
- pkg_appimage|length > 0
|
||||
become: "{{ install_become }}"
|
||||
become_user: "{{ install_become_user }}"
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
mode: '0755'
|
||||
path: "{{ path_appimage }}"
|
||||
|
||||
- name: Ensure archive path exists
|
||||
when:
|
||||
- pkg_archive|length > 0
|
||||
become: "{{ install_become }}"
|
||||
become_user: "{{ install_become_user }}"
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
mode: '0755'
|
||||
path: "{{ path_archive }}"
|
||||
|
||||
- name: Install pkg_sys list using system package manager
|
||||
when:
|
||||
- pkg_sys|length > 0
|
||||
@@ -108,14 +75,6 @@
|
||||
name: "{{ pkg_sys | unique }}"
|
||||
state: present
|
||||
|
||||
- name: Install pkg_archive
|
||||
when:
|
||||
- pkg_archive|length > 0
|
||||
loop: "{{ pkg_archive }}"
|
||||
loop_control:
|
||||
loop_var: archive
|
||||
ansible.builtin.include_tasks: helpers/archive.yml
|
||||
|
||||
- name: Linux specific tasks
|
||||
when:
|
||||
- system == 'Linux'
|
||||
@@ -126,6 +85,16 @@
|
||||
- distribution == 'MacOSX'
|
||||
ansible.builtin.include_tasks: macos.yml
|
||||
|
||||
- name: Install pkg_archive
|
||||
when:
|
||||
- pkg_archive|length > 0
|
||||
block:
|
||||
- name: Install archives
|
||||
loop: "{{ pkg_archive }}"
|
||||
loop_control:
|
||||
loop_var: archive
|
||||
ansible.builtin.include_tasks: helpers/archive.yml
|
||||
|
||||
- name: Install cargo packages
|
||||
when:
|
||||
- pkg_cargo|length > 0 or
|
||||
@@ -161,7 +130,7 @@
|
||||
loop_var: pkg
|
||||
ansible.builtin.include_tasks: helpers/npm.yml
|
||||
|
||||
- name: Install python pipx packages for user
|
||||
- name: Install python pipx packages
|
||||
when:
|
||||
- pkg_pipx|length > 0
|
||||
loop: "{{ pkg_pipx | unique }}"
|
||||
|
||||
Reference in New Issue
Block a user