Use a shell script to launch, where the environment can be checked

before x11 resources are loaded in python.

This prevents cinnamon-screensaver crashes when attempting to
launch it in wayland. This will let it abort cleanly.

src/binfile.in

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+  echo "cinnamon-screensaver is disabled in wayland sessions. Exiting."
+  exit 1
+fi
+
+exec @install_dir@/@target@ $@

src/cinnamon-screensaver-command.py

@@ -122,13 +122,6 @@ def perform_action(self):
         self.mainloop.quit()
 
 if __name__ == "__main__":
-    try:
-        if os.environ["WAYLAND_DISPLAY"]:
-            print("Cinnamon Screensaver is unavailable on Wayland.")
-            sys.exit(0)
-    except KeyError:
-        pass
-
     ml = GLib.MainLoop.new(None, True)
     main = ScreensaverCommand(ml)
 

src/cinnamon-screensaver-main.py

@@ -14,15 +14,6 @@
 import setproctitle
 import sys
 
-# Do this before importing ScreensaverService as that triggers all of the dbus services
-# including the XAppKbdLayoutController which is x11 only.
-try:
-    if os.environ["WAYLAND_DISPLAY"]:
-        print("Cinnamon Screensaver is unavailable on Wayland.")
-        sys.exit(0)
-except KeyError:
-    pass
-
 import config
 import status
 from util import utils, settings

src/meson.build

@@ -49,18 +49,31 @@ app_css = [
   'cinnamon-screensaver.css',
 ]
 
+install_data(app_py + app_css,
+  install_dir: pkgdatadir
+)
+
 app_scripts = [
   ['cinnamon-screensaver-main.py', 'cinnamon-screensaver'],
   ['cinnamon-screensaver-command.py', 'cinnamon-screensaver-command']
 ]
 
-install_data(app_py + app_css,
-  install_dir: pkgdatadir
-)
-
 foreach script : app_scripts
-  install_data(script[0], install_dir: pkgdatadir)
-  meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(bindir))
-  meson.add_install_script('sh', '-c',
-    'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1])))
+  prefix_info = configuration_data()
+  prefix_info.set('install_dir', pkgdatadir)
+  prefix_info.set('target', script[0])
+
+  bin_file = configure_file(
+    input : 'binfile.in',
+    output: script[1],
+    configuration: prefix_info,
+    install_dir: get_option('bindir'),
+    install_mode: 'rwxr-xr-x'
+  )
+
+  install_data(
+      script[0],
+      install_dir: pkgdatadir,
+      install_mode: 'rwxr-xr-x'
+  )
 endforeach