From 4999a9cd760bac09d469ae59a2ab0cd2897a787f Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Wed, 8 Jun 2022 23:49:30 +0200
Subject: [PATCH] updated firefox state

---
 states/firefox/defaults.yaml      |  2 +-
 states/firefox/firefox.desktop.j2 | 13 +++++--------
 states/firefox/install.sls        |  8 ++++++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/states/firefox/defaults.yaml b/states/firefox/defaults.yaml
index 039129a..c07dbf1 100644
--- a/states/firefox/defaults.yaml
+++ b/states/firefox/defaults.yaml
@@ -7,4 +7,4 @@ firefox:
   dest_path: "/usr/local/apps/firefox-"
   version: "100.0"
   platform: "linux-x86_64"
-  lang: "en-GB"
\ No newline at end of file
+  lang: "en-GB"
diff --git a/states/firefox/firefox.desktop.j2 b/states/firefox/firefox.desktop.j2
index 59e4c53..45ae596 100644
--- a/states/firefox/firefox.desktop.j2
+++ b/states/firefox/firefox.desktop.j2
@@ -1,14 +1,11 @@
 ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
 {%- from "firefox/map.jinja" import firefox with context %}
 [Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Firefox Web browser
+Name=Firefox
 Comment=Firefox Web browser
-Exec=/usr/bin/firefox
-Icon={{ firefox.install_dir }}/firefox/browser/chrome/icons/default/default128.png
-Terminal=false
-StartupWMClass=firefox
+Exec=firefox
+Icon=firefox
 Type=Application
 Categories=Network;WebBrowser;
-MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
\ No newline at end of file
+MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
+Version=1.0
\ No newline at end of file
diff --git a/states/firefox/install.sls b/states/firefox/install.sls
index 6330760..7ce5c81 100644
--- a/states/firefox/install.sls
+++ b/states/firefox/install.sls
@@ -38,6 +38,14 @@ firefox-shortcut:
     - require:
       - archive: firefox-archive-extract
 
+firefox-icon:
+  file.managed:
+    - name: /usr/share/icons/firefox.png
+    - source: /usr/local/apps/firefox/browser/chrome/icons/default/default128.png
+    - user: root
+    - group: root
+    - mode: 644
+
 firefox-cleanup:
   software.cleanup:
     - name: firefox