From fe364e2b6da65b62f2ce29774bc91fc007c11758 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Sat, 24 Jan 2026 14:25:33 -0700 Subject: [PATCH] need to test the alacritty build to make sure it's ready --- tasks/helpers/cargo_build.yml | 29 +++++++++++++++++++++++++++-- tasks/pkgs/alacritty.yml | 23 ++++++++++++++--------- vars/main.yml | 1 + 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/tasks/helpers/cargo_build.yml b/tasks/helpers/cargo_build.yml index 795ad6b..9372217 100644 --- a/tasks/helpers/cargo_build.yml +++ b/tasks/helpers/cargo_build.yml @@ -1,8 +1,6 @@ # vim: set filetype=yaml.ansible : --- - name: Cargo source install helper - when: - - cargo_install_type == 'source' block: - name: Set build variables ansible.builtin.set_fact: @@ -37,3 +35,30 @@ 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 }}" diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index 9d14e29..13dfb19 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -1,6 +1,7 @@ # vim: set filetype=yaml.ansible : --- - name: Configure alacritty # {{{ + when: __alacritty_configured is undefined block: - name: Set basic variables ansible.builtin.set_fact: @@ -41,10 +42,12 @@ bin_name: "alacritty" install_prefix: "/usr/local" install_files: - share/pixmaps: - - extra/logo/alacritty-term.svg - desktop: - - extra/linux/Alacritty.desktop + extra/logo/alacritty-term.svg: share/pixmaps/Alacritty.svg + desktop_files: + - extra/linux/Alacritty.desktop + files_list: + - bin/alacritty + - share/pixmaps/Alacritty.svg - name: Set alacritty install options block: @@ -99,17 +102,19 @@ block: - name: Append alacritty to pkg_cargo when: - - method == 'source' + - alacritty_method == 'source' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + alacritty_build_deps }}" - pkg_cargo: "{{ pkg_cargo + [alacritty_src_install] }}" + pkg_cargo_build: "{{ pkg_cargo_build + [alacritty_src_install] }}" - name: Append alacritty to pkg_cask when: - - alacritty.method == 'cask' + - alacritty_method == 'cask' ansible.builtin.set_fact: pkg_cask: "{{ pkg_cask + [alacritty_pkgname] }}" - - name: Set alacritty_configured + - name: Append alacritty to sys_pkg + when: + - alacritty_method == 'package' ansible.builtin.set_fact: - alacritty_configured: true + pkg_sys: "{{ pkg_sys + [alacritty_pkgname] }}" diff --git a/vars/main.yml b/vars/main.yml index 9321951..e89fcaf 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,7 @@ # vim: set filetype=yaml.ansible : # variables used in ansible_role_package --- +default_install_method: package debug: false use_local: false prefer_method: src