From fd5ce67146cd327b7b6413d98e416e4529befcc3 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Fri, 4 Apr 2025 16:17:22 -0600 Subject: [PATCH] port hyprgraphics to using helpers --- tasks/config/hyprgraphics.yml | 3 --- tasks/src/aquamarine.yml | 2 +- tasks/src/hyprgraphics.yml | 2 +- vars/pkgs/hyprgraphics.yml | 1 - vars/src/hyrpgraphics.yml | 1 + 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tasks/config/hyprgraphics.yml b/tasks/config/hyprgraphics.yml index 5dcd41f..9291a8f 100644 --- a/tasks/config/hyprgraphics.yml +++ b/tasks/config/hyprgraphics.yml @@ -4,8 +4,5 @@ ansible.builtin.set_fact: hyprgraphics: vers: "{{ pkgconfig.hyprgraphics.version }}" - repo: "{{ pkgconfig.hyprgraphics.repo }}" build_deps: "{{ srcconfig.hyprgraphics.deps[ansible_os_family] }}" - installed_files: "{{ pkgconfig.hyprgraphics.build_installed_files }}" - git_path: "{{ d_tempdir.path }}/hyprgraphics" clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/src/aquamarine.yml b/tasks/src/aquamarine.yml index ea49478..dc588df 100644 --- a/tasks/src/aquamarine.yml +++ b/tasks/src/aquamarine.yml @@ -6,7 +6,7 @@ vars: file_list: "{{ srcconfig.aquamarine.build_installed_files }}" ansible.builtin.include_tasks: - files: helpers/clean_install.yml + file: helpers/clean_install.yml - name: Check for installed {{ pkg }} register: stat_aquamarine_inst diff --git a/tasks/src/hyprgraphics.yml b/tasks/src/hyprgraphics.yml index 2fdf34c..0d3087b 100644 --- a/tasks/src/hyprgraphics.yml +++ b/tasks/src/hyprgraphics.yml @@ -35,4 +35,4 @@ install_creates: "{{ srcconfig.hyprgraphics.install_creates }}" install: "{{ srcconfig.hyprcursor.install }}" ansible.builtin.include_tasks: - files: helpers/cmake_build.yml + file: helpers/cmake_build.yml diff --git a/vars/pkgs/hyprgraphics.yml b/vars/pkgs/hyprgraphics.yml index 32fc1f4..f84c7d2 100644 --- a/vars/pkgs/hyprgraphics.yml +++ b/vars/pkgs/hyprgraphics.yml @@ -2,6 +2,5 @@ --- hyprgraphics: version: v0.1.2 - repo: "{{ hyprgitbase }}/hyprgraphics" pkg_deps: - hyprutils diff --git a/vars/src/hyrpgraphics.yml b/vars/src/hyrpgraphics.yml index 3ef09a0..2ebe4c1 100644 --- a/vars/src/hyrpgraphics.yml +++ b/vars/src/hyrpgraphics.yml @@ -1,6 +1,7 @@ # vim: set filetype=yaml.ansible : --- hyprgraphics: + gitrepo: "{{ hyprgitbase }}/hyprgraphics" src_path: "{{ d_tempdir.path }}/hyprgraphics" configure: - cmake