diff --git a/tasks/archive/pulumi.yml b/tasks/archive/pulumi.yml index 5bff569..5662b78 100644 --- a/tasks/archive/pulumi.yml +++ b/tasks/archive/pulumi.yml @@ -10,6 +10,6 @@ - name: Extract pulumi archive become: "{{ ext_become }}" ansible.builtin.unarchive: - dest: "{{ path.archive }}/pulumi" + dest: "{{ path.archive }}" src: "{{ d_tempdir.path }}/{{ pulumi.archive }}" remote_src: true diff --git a/tasks/config/hyprland.yml b/tasks/config/hyprland.yml index 3f5a0d5..016d215 100644 --- a/tasks/config/hyprland.yml +++ b/tasks/config/hyprland.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprland.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprland.build_installed_files }}" git_path: "{{ d_tempdir.path }}/Hyprland" + prefix: "/usr/local" diff --git a/tasks/src/aquamarine.yml b/tasks/src/aquamarine.yml index 4cec2da..5e82fa6 100644 --- a/tasks/src/aquamarine.yml +++ b/tasks/src/aquamarine.yml @@ -7,9 +7,16 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" + +- name: Check if aquamarine is installed + register: stat_aquamarine_inst + ansible.builtin.stat: + path: "{{ hyprland.prefix }}/lib64/libaquamarine.so" - name: Build and install aquamarine + when: + - stat_aquamarine_inst.stat.exists block: - name: Clone git repository ansible.builtin.git: @@ -26,7 +33,7 @@ - cmake - --no-warn-unused-cli - DCMAKE_BUILD_TYPE=Release - - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -S - . - -B diff --git a/tasks/src/hyprcursor.yml b/tasks/src/hyprcursor.yml index 18367ae..c08c925 100644 --- a/tasks/src/hyprcursor.yml +++ b/tasks/src/hyprcursor.yml @@ -7,9 +7,16 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" + +- name: Check if hyprcursor is installed + register: stat_hyprcursor_inst + ansible.builtin.stat: + path: "{{ hyprland.prefix }}/bin/hyprcursor-util" - name: Build and install hyprcursor + when: + - not stat_hyprcursor_inst.stat.exists block: - name: Clone git repository ansible.builtin.git: @@ -26,7 +33,7 @@ - cmake - --no-warn-unused-cli - DCMAKE_BUILD_TYPE=Release - - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -S - . - -B diff --git a/tasks/src/hyprgraphics.yml b/tasks/src/hyprgraphics.yml index 06a1e11..9fbdbae 100644 --- a/tasks/src/hyprgraphics.yml +++ b/tasks/src/hyprgraphics.yml @@ -7,9 +7,16 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" + +- name: Check if hyprgraphics is installed + register: stat_hyprgraphics_inst + ansible.builtin.stat: + path: "{{ hyprland.prefix }}/lib64/libhyprgraphics.so" - name: Build and install hyprgraphics + when: + - not stat_hyprgraphics_inst.stat.exists block: - name: Clone git repository ansible.builtin.git: @@ -26,7 +33,7 @@ - cmake - --no-warn-unused-cli - DCMAKE_BUILD_TYPE=Release - - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -S - . - -B diff --git a/tasks/src/hyprland.yml b/tasks/src/hyprland.yml index 9163bc5..d7ee0d3 100644 --- a/tasks/src/hyprland.yml +++ b/tasks/src/hyprland.yml @@ -7,12 +7,12 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" - name: Check if hyprland is installed register: stat_hyprland_bin ansible.builtin.stat: - path: "{{ path.bin }}/Hyprland" + path: "{{ hyprland.prefix }}/bin/Hyprland" - name: Build and install hyprland when: @@ -34,7 +34,7 @@ - cmake - --no-warn-unused-cli - -DCMAKE_BUILD_TYPE:STRING=Release - - -DCMAKE_INSTALL_PREFIX:PATH={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX:PATH={{ hyprland.prefix }} - -S - . - -B diff --git a/tasks/src/hyprlang.yml b/tasks/src/hyprlang.yml index f5a7754..d0a5a72 100644 --- a/tasks/src/hyprlang.yml +++ b/tasks/src/hyprlang.yml @@ -7,9 +7,16 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" + +- name: Check if hyprlang is installed + register: stat_hyprlang_inst + ansible.builtin.stat: + path: "{{ hyprland.prefix }}/lib64/libhyprlang.so" - name: Build and install hyprlang + when: + - not stat_hyprlang_inst.stat.exists block: - name: Clone git repository ansible.builtin.git: @@ -26,7 +33,7 @@ - cmake - --no-warn-unused-cli - DCMAKE_BUILD_TYPE=Release - - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -S - . - -B diff --git a/tasks/src/hyprutils.yml b/tasks/src/hyprutils.yml index 9de16e0..f44807d 100644 --- a/tasks/src/hyprutils.yml +++ b/tasks/src/hyprutils.yml @@ -7,9 +7,16 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" + +- name: Check if hyprutils is installed + register: stat_hyprutils_inst + ansible.builtin.stat: + path: "{{ hyprland.prefix }}/lib64/libhyprutils.so" - name: Build and install hyprutils + when: + - not stat_hyprutils_inst.stat.exists block: - name: Clone git repository ansible.builtin.git: @@ -26,7 +33,7 @@ - cmake - --no-warn-unused-cli - DCMAKE_BUILD_TYPE=Release - - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -S - . - -B diff --git a/tasks/src/hyprwayland_scanner.yml b/tasks/src/hyprwayland_scanner.yml index 130fa37..4ca8824 100644 --- a/tasks/src/hyprwayland_scanner.yml +++ b/tasks/src/hyprwayland_scanner.yml @@ -7,9 +7,16 @@ loop_var: file ansible.builtin.file: state: absent - path: "{{ path.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" + +- name: Check if hyprwayland-scanner is installed + register: stat_hyprwayland_scanner_inst + ansible.builtin.stat: + path: "{{ hyprland.prefix }}/bin/hyprwayland-scanner" - name: Build and install hyprwayland-scanner + when: + - not stat_hyprwayland_scanner_inst.stat.exists block: - name: Clone git repository ansible.builtin.git: @@ -24,7 +31,7 @@ chdir: "{{ d_tempdir.path }}/hyprwayland-scanner" argv: - cmake - - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -B - build