From fe7af27e2601d14e18e9abfe559c24bd18026638 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Tue, 25 Mar 2025 04:14:11 -0600 Subject: [PATCH] make paths only when needed --- tasks/linux.yml | 21 ++++++++++---- tasks/main.yml | 75 +++++++++++++++++++++++++++++++------------------ 2 files changed, 62 insertions(+), 34 deletions(-) diff --git a/tasks/linux.yml b/tasks/linux.yml index 43124a0..3e98074 100644 --- a/tasks/linux.yml +++ b/tasks/linux.yml @@ -33,11 +33,20 @@ remote: "{{ flatpak.remote | default('flathub') }}" state: present -- name: Install pkg_appimage +- name: Install appimages when: - pkg_appimage|length > 0 - loop: "{{ pkg_appimage }}" - loop_control: - loop_var: pkg - ansible.builtin.include_tasks: - file: appimage.yml + block: + - name: Ensure appimage path exists + become: "{{ ext_become }}" + ansible.builtin.file: + state: directory + mode: '0755' + path: "{{ path.appimage }}" + + - name: Install pkg_appimage + loop: "{{ pkg_appimage }}" + loop_control: + loop_var: pkg + ansible.builtin.include_tasks: + file: appimage.yml diff --git a/tasks/main.yml b/tasks/main.yml index b4d06e2..2b02432 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -37,16 +37,6 @@ ansible.builtin.debug: var: packages -- name: Ensure required path exist - become: "{{ ext_become }}" - loop: "{{ path | dict2items }}" - loop_control: - loop_var: p - ansible.builtin.file: - state: directory - mode: '0755' - path: "{{ p.value }}" - - name: Read default package configuration ansible.builtin.include_vars: dir: pkgs @@ -109,39 +99,68 @@ ansible.builtin.include_tasks: file: "archive/{{ pkg }}.yml" -- name: Install cargo packages +- name: Cargo Packages installalation when: - pkg_cargo|length > 0 - loop: "{{ pkg_cargo | unique }}" - loop_control: - loop_var: pkg - ansible.builtin.include_tasks: - file: cargo.yml + block: + - name: Ensure cargo path exists + become: "{{ ext_become }}" + ansible.builtin.file: + state: directory + mode: '0755' + path: "{{ path.cargo }}" -- name: Install go packages + - name: Install cargo packages + loop: "{{ pkg_cargo | unique }}" + loop_control: + loop_var: pkg + ansible.builtin.include_tasks: + file: cargo.yml + +- name: Go Packages installalation when: - pkg_go|length > 0 - loop: "{{ pkg_go | unique }}" - loop_control: - loop_var: pkg - ansible.builtin.include_tasks: - file: go.yml + block: + - name: Ensure go path exists + become: "{{ ext_become }}" + ansible.builtin.file: + state: directory + mode: '0755' + path: "{{ path.go }}" + + - name: Install go packages + loop: "{{ pkg_go | unique }}" + loop_control: + loop_var: pkg + ansible.builtin.include_tasks: + file: go.yml - name: Install local npm packages + when: + - pkg_npm|length > 0 loop: "{{ pkg_npm | unique }}" loop_control: loop_var: pkg ansible.builtin.include_tasks: file: npm.yml -- name: Install python pipx packages for user +- name: PipX Packages installalation when: - pkg_pipx|length > 0 - loop: "{{ pkg_pipx | unique }}" - loop_control: - loop_var: pkg - ansible.builtin.include_tasks: - file: pipx.yml + block: + - name: Ensure pipx path exists + become: "{{ ext_become }}" + ansible.builtin.file: + state: directory + mode: '0755' + path: "{{ path.pipx }}" + + - name: Install python pipx packages for user + loop: "{{ pkg_pipx | unique }}" + loop_control: + loop_var: pkg + ansible.builtin.include_tasks: + file: pipx.yml - name: Build and install source packages when: