working on cleanup and fixing a few format issues
- modifying how installs are done
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
when:
|
||||
- alacritty_install_method is undefined
|
||||
ansible.builtin.set_fact:
|
||||
alacritty_install_method: "{{ install_method if install_method in alacritty_install_methods else alacritty_install_methods[0] }}"
|
||||
alacritty_install_method: "{{ install_method if install_method in alacritty.install_methods else alacritty.install_methods[0] }}"
|
||||
|
||||
- name: Configure alacritty source install
|
||||
when:
|
||||
@@ -25,20 +25,13 @@
|
||||
block:
|
||||
- name: Set alacritty build facts
|
||||
ansible.builtin.set_fact:
|
||||
alacritty_build_deps: "{{ alacritty_build_deps[ansible_os_family] }}"
|
||||
alacritty_src_install:
|
||||
build_deps: "{{ alacritty.build_deps[ansible_facts['os_family']] }}"
|
||||
build_flags: "{{ alacritty_cargo_build_flags }}"
|
||||
name: "{{ alacritty_pkgname }}"
|
||||
source_dir: "{{ alacritty.install_files.source_dir }}"
|
||||
repo: "{{ alacritty_git_repo }}"
|
||||
version: "{{ alacritty_version }}"
|
||||
files:
|
||||
- from: target/release/alacritty
|
||||
to: bin/alacritty
|
||||
mode: '0755'
|
||||
- from: extra/logo/alacritty-term.svg
|
||||
to: share/pixmaps/Alacritty.svg
|
||||
- from: extra/linux/Alacritty.desktop
|
||||
to: share/applications/Alacritty.desktop
|
||||
files: "{{ alacritty.install_files.files }}"
|
||||
|
||||
- name: Set alacritty install extra build deps
|
||||
when:
|
||||
@@ -49,13 +42,13 @@
|
||||
when:
|
||||
- ansible_distribution_major_version == 7
|
||||
ansible.builtin.set_fact:
|
||||
alacritty_build_deps: "{{ alacritty_build_deps + ['xcb-util-devel', '@Development Tools'] }}"
|
||||
alacritty_build_deps: "{{ 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: "{{ alacritty_build_deps + ['@Development Tools'] }}"
|
||||
alacritty_build_deps: "{{ build_deps + ['@Development Tools'] }}"
|
||||
|
||||
# }}}
|
||||
- name: Append alacritty installation
|
||||
@@ -65,14 +58,14 @@
|
||||
- alacritty_method == 'source'
|
||||
block:
|
||||
- name: Configure pkg dependencies
|
||||
loop: "{{ alacritty_pkg_deps }}"
|
||||
loop: "{{ alacritty.pkg_deps }}"
|
||||
loop_control:
|
||||
loop_var: alacritty_pkg_dep
|
||||
ansible.builtin.include_tasks: "{{ alacritty_pkg_dep }}"
|
||||
loop_var: pkg
|
||||
ansible.builtin.include_tasks: "pkgs/{{ pkg }}.yml"
|
||||
|
||||
- name: Append build dependencies and cargo config
|
||||
ansible.builtin.set_fact:
|
||||
pkg_sys: "{{ pkg_sys + alacritty_build_deps }}"
|
||||
pkg_sys: "{{ pkg_sys + build_deps }}"
|
||||
pkg_cargo_build: "{{ pkg_cargo_build + [alacritty_src_install] }}"
|
||||
|
||||
- name: Append alacritty to pkg_sys
|
||||
|
||||
Reference in New Issue
Block a user