From bb6017d04150874e10a403dcef52cd8f168cddbd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mar 21 2023 18:15:29 +0000
Subject: Handle GNOME welcome app .desktop file rename


anaconda renamed the .desktop file for the GNOME live 'welcome'
app. We need to cope with that. This handles both names, so we
can use the same code on F39+ and <F39.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/libexec/livesys/sessions.d/livesys-gnome b/libexec/livesys/sessions.d/livesys-gnome
index 439ae52..89f6d14 100755
--- a/libexec/livesys/sessions.d/livesys-gnome
+++ b/libexec/livesys/sessions.d/livesys-gnome
@@ -49,11 +49,16 @@ favorite-apps=['firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.deskt
 FOE
 
   # Make the welcome screen show up
-  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
-    mkdir -p ~liveuser/.config/autostart
-    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
-    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
-  fi
+  # The name was changed in March 2023 in Fedora 39, we can stop
+  # caring about the old name (fedora-welcome.desktop) when F38 is
+  # EOL
+  for deskname in org.fedoraproject.welcome-screen.desktop fedora-welcome.desktop; do
+    if [ -f /usr/share/anaconda/gnome/${deskname} ]; then
+      mkdir -p ~liveuser/.config/autostart
+      cp /usr/share/anaconda/gnome/${deskname} /usr/share/applications/
+      cp /usr/share/anaconda/gnome/${deskname} ~liveuser/.config/autostart/
+    fi
+  done
 
   # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE