working on go

Signed-off-by: Matthew Stobbs <matthew@stobbs.ca>

tasks/pkgs/alacritty.yml

@@ -2,29 +2,21 @@
 ---
 - name: Configure alacritty # {{{
   when:
-    - __alacritty_configured is undefined or
-      not __alacritty_configured
+    - __alacritty_configured is undefined
   block:
-    - name: Set install method
+    - name: Set alacritty install method
       when:
         - alacritty_install_method is undefined
       ansible.builtin.set_fact:
         alacritty_install_method: "{% if default_install_method in alacritty_install_methods %}{{ default_install_method }}{% else %}{{ alacritty_install_methods[0] }}{% endif %}"
 
-    - name: Set basic variables
-      ansible.builtin.set_fact:
-        alacritty_version: "{{ alacritty_version | default('v0.16.1') }}"
-        alacritty_git_repo: "{{ alacritty_git_repo | default('https://github.com/alacritty/alacritty') }}"
-        alacritty_pkgname: "{{ alacritty_pkgname | default('alacritty') }}"
-        alacritty_build_deps_extra: []
-
     - name: Configure alacritty source install
       when:
         - alacritty_install_method == "source"
       ansible.builtin.set_fact:
+        alacritty_build_deps: "{{ alacritty_build_deps[ansible_os_family] }}"
         alacritty_src_install:
-          cargo_build_flags:
-            - --release
+          cargo_build_flags: "{{ alacritty_cargo_build_flags }}"
           name: "{{ alacritty_pkgname }}"
           repo: "{{ alacritty_git_repo }}"
           version: "{{ alacritty_version }}"
@@ -35,55 +27,7 @@
             extra/logo/alacritty-term.svg: share/pixmaps/Alacritty.svg
           desktop_files:
             - extra/linux/Alacritty.desktop
-          files_list:
-            - bin/alacritty
-            - share/pixmaps/Alacritty.svg
-        alacritty_build_deps:
-          RedHat:
-            - cmake
-            - fontconfig-devel
-            - freetype-devel
-            - g++
-            - libxcb-devel
-            - libxkbcommon-devel
-            - desktop-file-utils
-          Debian:
-            - cmake
-            - g++
-            - pkg-config
-            - libfontconfig1-dev
-            - libxcb-xfixes0-dev
-            - libxkbcommon-dev
-            - python3
-            - libfreetype6-dev
-            - desktop-file-utils
-          Alpine:
-            - cmake
-            - pkgconf
-            - freetype-dev
-            - fontconfig-dev
-            - python3
-            - libxcb-dev
-            - g++
-            - libxkbcommon-dev
-            - desktop-file-utils
-          Archlinux:
-            - cmake
-            - freetype2
-            - fontconfig
-            - pkg-config
-            - make
-            - libxcb
-            - libxkbcommon
-            - python
-            - desktop-file-utils
-          FreeBSD:
-            - cmake
-            - freetype2
-            - fontconfig
-            - pkgconf
-            - python3
-            - desktop-file-utils
+          files_list: "{{ alacritty_build_files }}"
 
         - name: Set alacritty install extra build deps
           when:
@@ -95,27 +39,29 @@
               when:
                 - ansible_distribution_major_version == 7
               ansible.builtin.set_fact:
-                alacritty_build_deps_extra: ['xcb-util-devel', '@Development Tools']
+                alacritty_build_deps: "{{ alacritty_build_deps + ['xcb-util-devel', '@Development Tools'] }}"
 
             - name: Add extra dependencies for EL8
               when:
                 - ansible_distribution_major_version == 8
               ansible.builtin.set_fact:
-                alacritty_build_deps_extra: ['@Development Tools']
-
-    - name: Complete alacritty configuration
-      when: __alacritty_configured is undefined
-      ansible.builtin.set_fact:
-        __alacritty_configured: true
+                alacritty_build_deps: "{{ alacritty_build_deps + ['@Development Tools'] }}"
 
 # }}}
-- name: Append alacritty installation
-  block:
-    - name: Append alacritty to pkg_cargo
-      when:
-        - alacritty_method == 'source'
+    - name: Append alacritty installation
+      block:
+        - name: Append alacritty to pkg_cargo
+          when:
+            - alacritty_method == 'source'
+          block:
+            - name: Configure pkg dependencies
+              loop: "{{ alacritty_pkg_deps }}"
+              loop_control:
+                loop_var: alacritty_pkg_dep
+              ansible.builtin.include_tasks: "{{ alacritty_pkg_dep }}"
+
       ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + alacritty_build_deps + alacritty_build_deps_extra + ['git'] }}"
+        pkg_sys: "{{ pkg_sys + alacritty_build_deps }}"
         pkg_cargo_build: "{{ pkg_cargo_build + [alacritty_src_install] }}"
 
     - name: Append alacritty to pkg_cask
@@ -129,3 +75,8 @@
         - alacritty_method == 'package'
       ansible.builtin.set_fact:
         pkg_sys: "{{ pkg_sys + [alacritty_pkgname] }}"
+
+    - name: Complete alacritty configuration
+      when: __alacritty_configured is undefined
+      ansible.builtin.set_fact:
+        __alacritty_configured: true