fixing obvious errors

tasks/helpers/appimage.yml

@@ -1,33 +1,29 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Install appimage {{ pkg }}
+- name: Install appimages
   become: "{{ install_become }}"
   become_user: "{{ install_become_user }}"
   block:
     - name: Ensure appimage path exists
       ansible.builtin.file:
-        path: "{{ path_appimage }}/{{ pkg.name }}"
-        mode: "{{ pkg.mode | default('0755') }}"
-        owner: "{{ pkg.owner | default(ansible_user_id) }}"
-        group: "{{ pkg.group | default(ansible_user_gid) }}"
+        path: "{{ path_appimage }}/{{ appimage.name }}"
+        mode: "{{ appimage.mode | default('0755') }}"
+        owner: "{{ appimage.owner | default(ansible_user_id) }}"
+        group: "{{ appimage.group | default(ansible_user_gid) }}"
         state: directory
 
     - name: Fetch appimage
-      become: "{{ install_become }}"
-      become_user: "{{ install_become_user }}"
       ansible.builtin.get_url:
-        mode: "{{ pkg.mode | default('0755') }}"
-        owner: "{{ pkg.owner | default(ansible_user_id) }}"
-        group: "{{ pkg.group | default(ansible_user_gid) }}"
-        url: "{{ pkg.url }}"
-        dest: "{{ path_appimage }}/{{ pkg.name }}/{{ pkg.filename }}"
+        mode: "{{ appimage.mode | default('0755') }}"
+        owner: "{{ appimage.owner | default(ansible_user_id) }}"
+        group: "{{ appimage.group | default(ansible_user_gid) }}"
+        url: "{{ appimage.url }}"
+        dest: "{{ path_appimage }}/{{ appimage.name }}/{{ appimage.filename }}"
         decompress: false
         backup: false
 
     - name: Link appimage to bin
-      become: "{{ install_become }}"
-      become_user: "{{ install_become_user }}"
       ansible.builtin.file:
         state: link
-        src: "{{ path_appimage }}/{{ pkg.name }}/{{ pkg.filename }}"
-        path: "{{ path_bin }}/{{ pkg.name }}"
+        src: "{{ path_appimage }}/{{ appimage.name }}/{{ appimage.filename }}"
+        path: "{{ path_bin }}/{{ appimage.name }}"

tasks/helpers/archive.yml

@@ -2,9 +2,9 @@
 ---
 - name: Ensure requirements met
   when:
-    - pkg.extract_to is defined
-    - pkg.name is defined
-    - pkg.url is defined
+    - archive.extract_to is defined
+    - archive.name is defined
+    - archive.url is defined
   block:
     - name: Extract archive to given path
       block:
@@ -13,16 +13,16 @@
           become_user: "{{ install_become_user }}"
           ansible.builtin.file:
             state: directory
-            path: "{{ pkg.extract_to }}"
-            mode: "{{ pkg.mode | default('0755') }}"
-            owner: "{{ pkg.owner | default(ansible_user_id)}}"
-            group: "{{ pkg.group | default(ansible_user_gid) }}"
+            path: "{{ archive.extract_to }}"
+            mode: "{{ archive.mode | default('0755') }}"
+            owner: "{{ archive.owner | default(ansible_user_id)}}"
+            group: "{{ archive.group | default(ansible_user_gid) }}"
 
         - name: Download archive to cache
           ansible.builtin.get_url:
-            dest: "{{ d_cache.path }}/{{ pkg.name }}"
-            url: "{{ pkg.url }}"
-            checksum: "{{ pkg.checksum | default(omit) }}"
+            dest: "{{ d_cache.path }}/{{ archive.name }}"
+            url: "{{ archive.url }}"
+            checksum: "{{ archive.checksum | default(omit) }}"
             decompress: false
             mode: '0644'
 
@@ -30,19 +30,19 @@
           become: "{{ install_become }}"
           become_user: "{{ install_become_user }}"
           ansible.builtin.unarchive:
-            dest: "{{ pkg.extract_to }}"
-            src: "{{ d_cache.path }}/{{ pkg.name }}"
+            dest: "{{ archive.extract_to }}"
+            src: "{{ d_cache.path }}/{{ archive.name }}"
             remote_src: true
-            include: "{{ pkg.include | default(omit) }}"
-            exclude: "{{ pkg.exclude | default(omit) }}"
+            include: "{{ archive.include | default(omit) }}"
+            exclude: "{{ archive.exclude | default(omit) }}"
 
         - name: Symlink archive files
           become: "{{ install_become }}"
           become_user: "{{ install_become_user }}"
           when:
-            - pkg.links is defined
-            - pkg.links | length > 0
-          loop: "{{ pkg.links }}"
+            - archive.links is defined
+            - archive.links | length > 0
+          loop: "{{ archive.links }}"
           loop_control:
             loop_var: lnk
           ansible.builtin.file:

tasks/helpers/cargo.yml

@@ -4,7 +4,7 @@
   become: "{{ install_become }}"
   become_user: "{{ install_become_user }}"
   community.general.cargo:
-    name: "{{ pkg.name | default(pkg) }}"
-    version: "{{ pkg.version | default(omit) }}"
-    locked: "{{ pkg.locked | default(false) }}"
+    name: "{{ cargo.name  }}"
+    version: "{{ cargo.version | default(omit) }}"
+    locked: "{{ cargo.locked | default(false) }}"
     path: "{{ install_prefix }}"

tasks/helpers/cargo_build.yml

@@ -2,64 +2,50 @@
 ---
 - name: Cargo source install helper
   block:
-    - name: Set build variables
-      ansible.builtin.set_fact:
-        git_path: "{{ d_tempdir.path }}/{{ pkg.name }}"
-        git_repo: "{{ pkg.repo }}"
-        git_depth: "{{ pkg.depth | default(1) }}"
-        git_recursive: "{{ pkg.recursive | default(true) }}"
-        git_version: "{{ pkg.version | default(omit) }}"
-
     - name: Fetch git repo
+      vars:
+        git:
+          path: "{{ d_cache.path }}/{{ cargo_build.name }}"
+          repo: "{{ cargo_build.repo }}"
+          depth: "{{ cargo_build.depth | default(1) }}"
+          force: "{{ cargo_build.force_git | default(true) }}"
+          recursive: "{{ cargo_build.recursive | default(true) }}"
+          version: "{{ cargo_build.version | default(omit) }}"
       ansible.builtin.include_tasks:
         file: helpers/git.yml
 
     - name: Build cargo release
       ansible.builtin.command:
-        creates: "{{ pkg.bin_output }}"
-        chdir: "{{ pkg.path }}"
-        argv: "{{ [cargo, build] + pkg.build_flags }}"
+        chdir: "{{ d_cache.path }}/{{ cargo_build.name }}"
+        argv: "{{ [cargo, build] + cargo_build.build_flags }}"
 
     - name: Install cargo release
       block:
-        - name: Install binary
-          when:
-            - bin_name is defined
-            - bin_output is defined
-          become: true
+        - name: Create missing directories
+          become: "{{ install_become }}"
+          become_user: "{{ install_become_user }}"
+          loop: "{{ cargo_build.files }}"
+          loop_control:
+            loop_var: file
+          ansible.builtin.file:
+            state: directory
+            path: "{{ install_prefix }}/{{ file.to | dirname }}"
+            mode: '0755'
+            owner: "{{ cargo_build.owner | default(ansible_user_id) }}"
+            group: "{{ cargo_build.group | default(ansible_user_gid) }}"
+          
+        - name: Install release files
+          become: "{{ install_become }}"
+          become_user: "{{ install_become_user }}"
+          loop: "{{ cargo_build.files }}"
+          loop_control:
+            loop_var: file
           ansible.builtin.copy:
             backup: false
-            dest: "{{ install_prefix }}/bin/{{ bin_name }}"
-            owner: root
-            group: root
-            mode: "0755"
             remote_src: true
-            src: "{{ git_path }}/{{ bin_output }}"
-
-        - name: Install additional files
-          when:
-            - install_files is defined
-          block:
-            - name: Create missing directories
-              loop: "{{ install_files | dict2items }}"
-              loop_control:
-                loop_var: file
-              ansible.builtin.file:
-                path: "{{ install_prefix }}/{{ file.value | dirname }}"
-                owner: root
-                group: root
-                mode: "0755"
-                state: directory
-
-            - name: Copy extra files
-              loop: "{{ install_files | dict2items }}"
-              loop_control:
-                loop_var: file
-              ansible.builtin.copy:
-                backup: false
-                dest: "{{ install_prefix }}/{{ file.value }}"
-                owner: root
-                group: root
-                mode: "0644"
-                remote_src: true
-                src: "{{ git_path }}/{{ file.key }}"
+            src: "{{ d_cache.path }}/{{ cargo_build.name }}/{{ file.from }}"
+            dest: "{{ install_prefix }}/{{ file.to }}"
+            owner: "{{ cargo_build.owner | default(ansible_user_id) }}"
+            group: "{{ cargo_build.group | default(ansible_user_gid) }}"
+            mode: "{{ file.mode | default('0644') }}"
+            force: "{{ file.force | default(true) }}"

tasks/helpers/flatpak.yml

@@ -4,7 +4,7 @@
   become: "{{ install_become }}"
   become_user: "{{ install_become_user }}"
   community.general.flatpak:
-    method: "{{ flatpak.method | default('system') }}"
-    remote: "{{ flatpak.remote }}"
     name: "{{ flatpak.name }}"
+    remote: "{{ flatpak.remote }}"
+    method: "{{ flatpak.method | default('system') }}"
     state: "{{ flatpak.state | default('present') }}"

tasks/helpers/flatpak_remote.yml

@@ -4,8 +4,8 @@
   become: "{{ install_become }}"
   become_user: "{{ install_become_user }}"
   community.general.flatpak_remote:
-    enabled: "{{ remote.enabled | default(true) }}"
-    flatpakrepo_url: "{{ remote.url }}"
-    method: "{{ remote.method | default('system') }}"
     name: "{{ remote.name }}"
+    flatpakrepo_url: "{{ remote.url }}"
+    enabled: "{{ remote.enabled | default(true) }}"
+    method: "{{ remote.method | default('system') }}"
     state: "{{ remote.state | default('present') }}"