4 files changed, 13 insertions, 10 deletions
diff --git a/raveos-gnome-theme/PKGBUILD b/raveos-gnome-theme/PKGBUILD
index 9aec202..94fbe37 100644
--- a/raveos-gnome-theme/PKGBUILD
+++ b/raveos-gnome-theme/PKGBUILD
@@ -15,7 +15,7 @@
 
 pkgname=raveos-gnome-theme
 pkgver=0.0.0
-pkgrel=26
+pkgrel=28
 pkgdesc="RaveOS GNOME theme payload and installer"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-gnome-theme/raveos-gnome-apply.sh b/raveos-gnome-theme/raveos-gnome-apply.sh
index faf6c29..c89aacb 100755
--- a/raveos-gnome-theme/raveos-gnome-apply.sh
+++ b/raveos-gnome-theme/raveos-gnome-apply.sh
@@ -170,7 +170,7 @@ install_user() {
                 gsettings set org.gnome.desktop.background picture-uri 'file://${target_home}/.config/background' || true
                 gsettings set org.gnome.desktop.background picture-uri-dark 'file://${target_home}/.config/background' || true
                 gsettings set org.gnome.shell.extensions.user-theme name 'Yaru-olive-dark' || true
-            " || true
+            " </dev/null >/dev/null 2>&1 || true
     fi
 
     rm -rf "$tmpdir"
diff --git a/raveos-gnome-theme/raveos-gnome-theme-apply.service b/raveos-gnome-theme/raveos-gnome-theme-apply.service
index be12b4e..28d38d5 100644
--- a/raveos-gnome-theme/raveos-gnome-theme-apply.service
+++ b/raveos-gnome-theme/raveos-gnome-theme-apply.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Apply RaveOS GNOME theme payload
-After=local-fs.target systemd-user-sessions.service
+After=local-fs.target
+Before=display-manager.service
 ConditionPathExists=!/var/lib/raveos-gnome-theme/.applied
 
 [Service]
diff --git a/raveos-gnome-theme/raveos-gnome-theme.install b/raveos-gnome-theme/raveos-gnome-theme.install
index 02f605f..58db3fe 100644
--- a/raveos-gnome-theme/raveos-gnome-theme.install
+++ b/raveos-gnome-theme/raveos-gnome-theme.install
@@ -1,14 +1,16 @@
-post_install() {
+_enable_apply_service() {
     if command -v systemctl >/dev/null 2>&1; then
         systemctl enable raveos-gnome-theme-apply.service >/dev/null 2>&1 || true
     fi
-    if [[ -x /usr/lib/raveos-gnome-theme/auto-apply.sh ]]; then
-        /usr/lib/raveos-gnome-theme/auto-apply.sh || true
-    fi
+}
+
+post_install() {
+    _enable_apply_service
 }
 
 post_upgrade() {
-    if [[ -x /usr/lib/raveos-gnome-theme/auto-apply.sh ]]; then
-        /usr/lib/raveos-gnome-theme/auto-apply.sh || true
-    fi
+    # Never rewrite a live GNOME session from inside a pacman transaction.
+    # The boot service applies the new payload before the display manager starts.
+    rm -f /var/lib/raveos-gnome-theme/.applied
+    _enable_apply_service
 }