From 6572974d4918660ad7c31180746aee4c97c56e3e Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Wed, 10 Jun 2020 11:04:21 +0100 Subject: [PATCH] Use one web-browser object either for -esr or normal --- roles/home-gui/tasks/mate.yml | 1 + roles/home-gui/templates/mate-acp.layout | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/roles/home-gui/tasks/mate.yml b/roles/home-gui/tasks/mate.yml index 346ea1b..33ef115 100644 --- a/roles/home-gui/tasks/mate.yml +++ b/roles/home-gui/tasks/mate.yml @@ -9,3 +9,4 @@ dest: "{{ ansible_env.HOME }}/.local/share/mate-panel/layouts/acp.layout" vars: prefix: "{{ '/usr' if ansible_system == 'Linux' else '/usr/pkg' if ansible_system == 'NetBSD' else '/usr/local' }}" + esr: "{{ '-esr' if ansible_distribution == 'Debian' else '' }}" diff --git a/roles/home-gui/templates/mate-acp.layout b/roles/home-gui/templates/mate-acp.layout index ffe6075..082b5c8 100644 --- a/roles/home-gui/templates/mate-acp.layout +++ b/roles/home-gui/templates/mate-acp.layout @@ -30,18 +30,11 @@ toplevel-id=top position=30 locked=true -[Object web-browser-esr] -object-type=launcher -launcher-location={{ prefix }}/share/applications/firefox-esr.desktop -toplevel-id=top -position=40 -locked=true - [Object web-browser] object-type=launcher -launcher-location={{ prefix }}/share/applications/firefox.desktop +launcher-location={{ prefix }}/share/applications/firefox{{ esr }}.desktop toplevel-id=top -position=41 +position=40 locked=true [Object window-list]