fix multiple source install bugs
This commit is contained in:
@@ -13,7 +13,9 @@
|
||||
deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}"
|
||||
vers: "{{ pkgconfig.ghostty.version }}"
|
||||
pkg: "{{ pkgconfig.ghostty[ghostty.method] }}"
|
||||
repo: "{{ pkgconfig.ghostty.git_repo }}"
|
||||
build_deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}"
|
||||
optimize: "{{ pkgconfig.ghostty.optimize }}"
|
||||
|
||||
- name: Set ghostty config for appimage install
|
||||
when:
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
method: "{{ neovim.method }}"
|
||||
vers: "v{{ pkgconfig.neovim.version }}"
|
||||
pkgs: "{{ pkgconfig.neovim.pkgs[ansible_distribution] | default(pkgconfig.neovim.pkgs.default) }}"
|
||||
git_repo: "{{ pkgconfig.neovim.git_repo }}"
|
||||
|
||||
- name: Set neovim config for appimage install
|
||||
when:
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
pkg_snap: [] # snpacraft.io packages
|
||||
pipx_exec: "/usr/bin/pipx"
|
||||
sys_pkg_become: true # Linux package managers require sudo access
|
||||
lib_path: lib64
|
||||
|
||||
- name: Set alpine linux specific facts
|
||||
when:
|
||||
- ansible_os_family == 'Alpine'
|
||||
ansible.builtin.set_fact:
|
||||
lib_path: lib
|
||||
|
||||
- name: Set rpm dist if RedHat based
|
||||
when:
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
# create all the facts used throughout the role, but shouldn't be touched
|
||||
# by the user
|
||||
- name: Create temporary directory for downloads
|
||||
ansible.builtin.tempfile:
|
||||
state: directory
|
||||
prefix: ansible_role_package.
|
||||
register: d_tempdir
|
||||
ansible.builtin.file:
|
||||
path: /tmp/ansible_role_package
|
||||
state: directory
|
||||
|
||||
- name: Set installation facts
|
||||
ansible.builtin.include_tasks:
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
- aquamarine_configured is undefined
|
||||
block:
|
||||
- name: Load aquamarine config
|
||||
when:
|
||||
- aquamarine is undefined
|
||||
ansible.builtin.include_tasks:
|
||||
file: config/aquamarine.yml
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
- name: Check if aquamarine is installed
|
||||
register: stat_aquamarine_inst
|
||||
ansible.builtin.stat:
|
||||
path: "{{ hyprland.prefix }}/lib64/libaquamarine.so"
|
||||
path: "{{ hyprland.prefix }}/{{ lib_path }}/libaquamarine.so"
|
||||
|
||||
- name: Build and install aquamarine
|
||||
when:
|
||||
- stat_aquamarine_inst.stat.exists
|
||||
- not stat_aquamarine_inst.stat.exists
|
||||
block:
|
||||
- name: Clone git repository
|
||||
ansible.builtin.git:
|
||||
@@ -25,6 +25,12 @@
|
||||
repo: "{{ aquamarine.repo }}"
|
||||
version: "{{ aquamarine.vers }}"
|
||||
|
||||
- name: Apply patch for alpine linux
|
||||
ansible.posix.patch:
|
||||
basedir: "{{ aquamarine.git_path }}"
|
||||
src: aquamarine/Alpine.patch
|
||||
state: present
|
||||
|
||||
- name: Configure aquamarine
|
||||
ansible.builtin.command:
|
||||
creates: "{{ aquamarine.git_path }}/build"
|
||||
@@ -32,7 +38,7 @@
|
||||
argv:
|
||||
- cmake
|
||||
- --no-warn-unused-cli
|
||||
- DCMAKE_BUILD_TYPE=Release
|
||||
- -DCMAKE_BUILD_TYPE=Release
|
||||
- -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }}
|
||||
- -S
|
||||
- .
|
||||
@@ -57,7 +63,7 @@
|
||||
- name: Install aquamarine
|
||||
become: true
|
||||
ansible.builtin.command:
|
||||
creates: "{{ path.bin }}/aquamarine"
|
||||
creates: "{{ hyprland.prefix }}/{{ lib_path }}/libaquamarine.so"
|
||||
chdir: "{{ aquamarine.git_path }}"
|
||||
argv:
|
||||
- cmake
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
register: c_ghostty_build
|
||||
ansible.builtin.command:
|
||||
chdir: "{{ d_tempdir.path }}/ghostty"
|
||||
cmd: "zig build -p {{ path.prefix }} -D{{ pkgconfig_ghostty.optimize }}"
|
||||
cmd: "zig build -p {{ path.prefix }} -Doptimize={{ ghostty.optimize }}"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
- name: Check if hyprgraphics is installed
|
||||
register: stat_hyprgraphics_inst
|
||||
ansible.builtin.stat:
|
||||
path: "{{ hyprland.prefix }}/lib64/libhyprgraphics.so"
|
||||
path: "{{ hyprland.prefix }}/{{ lib_path }}/libhyprgraphics.so"
|
||||
|
||||
- name: Build and install hyprgraphics
|
||||
when:
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
- name: Check if hyprlang is installed
|
||||
register: stat_hyprlang_inst
|
||||
ansible.builtin.stat:
|
||||
path: "{{ hyprland.prefix }}/lib64/libhyprlang.so"
|
||||
path: "{{ hyprland.prefix }}/{{ lib_path }}/libhyprlang.so"
|
||||
|
||||
- name: Build and install hyprlang
|
||||
when:
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
- name: Check if hyprutils is installed
|
||||
register: stat_hyprutils_inst
|
||||
ansible.builtin.stat:
|
||||
path: "{{ hyprland.prefix }}/lib64/libhyprutils.so"
|
||||
path: "{{ hyprland.prefix }}/{{ lib_path }}/libhyprutils.so"
|
||||
|
||||
- name: Build and install hyprutils
|
||||
when:
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
ansible.builtin.git:
|
||||
depth: 1
|
||||
dest: "{{ d_tempdir.path }}/neovim"
|
||||
repo: "{{ pkgconfig_neovim.git_repo }}"
|
||||
version: "{{ pkgconfig_neovim.version }}"
|
||||
repo: "{{ neovim.git_repo }}"
|
||||
version: "{{ neovim.version }}"
|
||||
|
||||
- name: Build and install neovim
|
||||
become: "{{ ext_become }}"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
- name: Check if sdbus-cpp-2 is installed
|
||||
register: stat_sdbus_cpp_2_inst
|
||||
ansible.builtin.stat:
|
||||
path: "{{ sdbus_cpp_2.prefix }}/lib64/libsdbus-c++.so"
|
||||
path: "{{ sdbus_cpp_2.prefix }}/{{ lib_path }}/libsdbus-c++.so"
|
||||
|
||||
- name: Build and install sdbus-cpp-2
|
||||
when:
|
||||
@@ -58,7 +58,7 @@
|
||||
- name: Install sdbus_cpp_2
|
||||
become: true
|
||||
ansible.builtin.command:
|
||||
creates: "{{ sdbus_cpp_2.prefix }}/lib64/libsdbus-c++.so"
|
||||
creates: "{{ sdbus_cpp_2.prefix }}/{{ lib_path }}/libsdbus-c++.so"
|
||||
chdir: "{{ sdbus_cpp_2.git_path }}"
|
||||
argv:
|
||||
- cmake
|
||||
|
||||
Reference in New Issue
Block a user