From cbe9b4002325d323cbf70a05124afb32f324ee8f Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Sat, 6 Jul 2024 13:04:10 +0100 Subject: [PATCH] Fix ulauncher role on Ubuntu derived distros --- playbooks/Linux.yaml | 1 + roles/ulauncher/tasks/Debian.yaml | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/playbooks/Linux.yaml b/playbooks/Linux.yaml index 5fb060b..8719a11 100644 --- a/playbooks/Linux.yaml +++ b/playbooks/Linux.yaml @@ -12,3 +12,4 @@ - role: gnome-shell when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP" - role: xremap + when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP" diff --git a/roles/ulauncher/tasks/Debian.yaml b/roles/ulauncher/tasks/Debian.yaml index 32448d7..fe09c22 100644 --- a/roles/ulauncher/tasks/Debian.yaml +++ b/roles/ulauncher/tasks/Debian.yaml @@ -9,6 +9,25 @@ force: true environment: '{{proxy_environment}}' +- name: slurp /etc/os-release + when: ansible_distribution != 'Debian' + slurp: + src: /etc/os-release + register: os_release_slurp + +- when: ansible_distribution != 'Debian' + set_fact: + os_release: "{{ os_release_slurp.content | + b64decode | trim() | replace('=', ': ') | from_yaml }}" + +- set_fact: + codename: '{{ansible_distribution_release}}' +- when: ansible_distribution != 'Debian' and 'UBUNTU_CODENAME' in os_release + set_fact: + codename: '{{os_release.UBUNTU_CODENAME}}' + +- debug: var=codename + - name: add apt sources list when: ansible_distribution == 'Debian' become: true @@ -16,7 +35,7 @@ content: >- deb [signed-by={{ulauncher_keyring_path}}] http://ppa.launchpad.net/agornostal/ulauncher/ubuntu - {{ansible_distribution_release}} main" + {{codename}} main" dest: '{{ulauncher_apt_sources_list_path}}' - name: add ppa repository @@ -24,6 +43,7 @@ become: true apt_repository: repo: ppa:agornostal/ulauncher + codename: '{{codename}}' - name: install apt package become: true