CHANGED: Mitigate Fedora issue by replacing file.managed source: in common.darkmode

diff --git a/user_salt/common/darkmode/darkmode--configure.sls b/user_salt/common/darkmode/darkmode--configure.sls
index b4b7b5dc686dec81bbfc6ad188fa3dd7afd11de9..fedce05a74db630d89018aadb821999c43ae59e1 100644 (file)
--- a/user_salt/common/darkmode/darkmode--configure.sls
+++ b/user_salt/common/darkmode/darkmode--configure.sls
@@ -1,12 +1,32 @@
 darkmode--configure-profile:
   file.managed:
     - name: /etc/profile.d/darkmode.sh
-    - source: salt://common/darkmode/files/darkmode.sh
+    - contents: |
+        #!/bin/bash
+        export QT_QPA_PLATFORMTHEME=gtk2
+        export QT_STYLE_OVERRIDE=Adwaita-dark
+        export GTK_THEME=Adwaita:dark
     - user: root
     - group: root
     - mode: 755
 
+darkmode--ensure-environment-file-exists:
+  file.managed:
+    - name: /etc/environment
+    - user: root
+    - group: root
+    - mode: 644
+    - create: True
+    - replace: False
+
 darkmode--configure-environment:
-  file.append:
+  file.blockreplace:
     - name: /etc/environment
-    - source: salt://common/darkmode/files/environment
+    - marker_start: "# {mark} QT THEME SETTING (SALT) - START"
+    - marker_end: "# {mark} QT THEME SETTING (SALT) - END"
+    - content: |
+        QT_QPA_PLATFORMTHEME=gtk2
+    - append_if_not_found: True
+    - show_changes: True
+    - require:
+      - file: darkmode--ensure-environment-file-exists

diff --git a/user_salt/common/darkmode/files/darkmode.sh b/user_salt/common/darkmode/files/darkmode.sh
deleted file mode 100644 (file)
index e420f4b..0000000
--- a/user_salt/common/darkmode/files/darkmode.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export QT_QPA_PLATFORMTHEME=gtk2
-export QT_STYLE_OVERRIDE=Adwaita-dark
-export GTK_THEME=Adwaita:dark

diff --git a/user_salt/common/darkmode/files/environment b/user_salt/common/darkmode/files/environment
deleted file mode 100644 (file)
index acaddfc..0000000
--- a/user_salt/common/darkmode/files/environment
+++ /dev/null
@@ -1 +0,0 @@
-QT_QPA_PLATFORMTHEME=gtk2

diff --git a/user_salt/common/darkmode/init.sls b/user_salt/common/darkmode/init.sls
index a813d5d85eb07d1536f8eeb73ab2a1a986c38064..d2fb784afbd3c97fe9fe1c38008d5c688e0f893f 100644 (file)
--- a/user_salt/common/darkmode/init.sls
+++ b/user_salt/common/darkmode/init.sls
@@ -1,3 +1,3 @@
 include:
   - common.darkmode.darkmode--configure
-  - common.darkmode.darkmode--install-packages
+#  - common.darkmode.darkmode--install-packages