Merge ~gunnarhj/ubuntu-release-upgrader:more-temp-font into ubuntu-release-upgrader:ubuntu/main

[Gunnar Hjalmarsson]

* Fixes 'the unreadable text issue' for Ubuntu Cinnamon
* Use an autostart file for more flavors

[Nick Rosbrook (enr0n)]

Thanks for looking into all of these flavors. I think the approach here makes sense, I just left some minor comments on the diff.

review: Needs Fixing

[Gunnar Hjalmarsson (gunnarhj)]

I don't think there is any specification of XDG_CURRENT_DESKTOP in the sense you ask for. I have learnt to not rely on the elements in the list coming in a particular order. For most flavors there is only one element, and Unity can serve as another example to make the point:

Unity:Unity7:ubuntu

But I made use of your oneliner to decide if autostart should be used.

[Nick Rosbrook (enr0n)]

Ack, thanks for that explanation. LGTM.

review: Approve

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 3ba9fc7..f8fe3de 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -1475,15 +1475,6 @@ class DistUpgradeQuirks(object):
                 'not change font'
             )
             return
-
-        desktops = os.getenv('XDG_CURRENT_DESKTOP', '').split(':')
-        if 'MATE' in desktops:
-            schema = 'org.mate.interface'
-            is_mate = True
-        else:
-            schema = 'org.gnome.desktop.interface'
-            is_mate = False
-
         try:
             uid = int(os.getenv('SUDO_UID', os.getenv('PKEXEC_UID')))
             pwuid = pwd.getpwuid(uid)
@@ -1493,6 +1484,20 @@ class DistUpgradeQuirks(object):
             )
             return
 
+        schema = 'org.gnome.desktop.interface'
+
+        desktops = os.getenv('XDG_CURRENT_DESKTOP', '').split(':')
+
+        # Some flavors use other schemas for the desktop font.
+        if 'MATE' in desktops or 'UKUI' in desktops:
+            schema = 'org.mate.interface'
+        elif 'X-Cinnamon' in desktops:
+            schema = 'org.cinnamon.desktop.interface'
+
+        # Some flavors lack the systemd integration needed for a
+        # user service, so we create an autostart file instead.
+        use_autostart = set(['Budgie', 'LXQt', 'MATE', 'UKUI', 'X-Cinnamon', 'XFCE']) & set(desktops)
+
         r = subprocess.run(
             ['systemd-run', '--user', '-M', f'{pwuid.pw_name}@.host',
              '--wait', '--pipe', '-q', '--',
@@ -1533,9 +1538,7 @@ class DistUpgradeQuirks(object):
         pathlib.Path(need_font_restore_file).touch(mode=0o666)
         os.chown(need_font_restore_file, pwuid.pw_uid, pwuid.pw_gid)
 
-        if is_mate:
-            # For MATE we create an autostart file instead of a service, since
-            # MATE hasn't enabled systemd integration.
+        if use_autostart:
             autostart_file = '/etc/xdg/autostart/upgrade-restore-font.desktop'
             os.makedirs(os.path.dirname(autostart_file), exist_ok=True)
             flag = '$HOME/.config/upgrade-need-font-restore'