build: Fix some hardcode path issues (#11244)

bobby285271 · web-flow · commit b881ad787c6d · 2022-11-07T11:17:08.000-05:00
* build: don't hardcode exec path for applications/cinnamon2d.desktop

Some systems like NixOS does not follow FHS and cinnamon is not
installed in /usr/bin, let's respect the bindir option from Meson.

* build: don't hardcode exec path for xsession desktop files

Some systems like NixOS does not follow FHS and cinnamon is not
installed in /usr/bin, let's respect the bindir option from Meson.

* build: don't hardcode exec path for dbus service files

Some systems like NixOS does not follow FHS and cinnamon is not
installed in /usr/bin, let's respect the bindir option from Meson.

* treewide: Use shutil.which instead of hardcoding path when possible

When checking whether a program is available, let's use shutil.which
instead of looking into /usr/bin, sometimes the program is installed
elsewhere and it will be nice to actually respect PATH.

* data/services: Move all dbus service files into same folder

This should not introduce any behavior changes.
diff --git a/calendar-server/meson.build b/calendar-server/meson.build
@@ -12,16 +12,6 @@ launcher = configure_file(
     install_mode: 'rwxr-xr-x'
 )
 
-service_conf = configuration_data()
-service_conf.set('BINDIR', join_paths(prefix, bindir))
-
-launcher = configure_file(
-    input: 'org.cinnamon.CalendarServer.service.in',
-    output: 'org.cinnamon.CalendarServer.service',
-    configuration: service_conf,
-    install_dir: dbus_services_dir
-)
-
 install_data(
     'cinnamon-calendar-server.py',
     install_dir: libexecdir,
diff --git a/data/cinnamon2d.desktop.in.in b/data/cinnamon2d.desktop.in.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name=Cinnamon 2D
-Comment=Window management and application launching
-Exec=/usr/bin/cinnamon2d
+_Name=Cinnamon 2D
+_Comment=Window management and application launching
+Exec=@bindir@/cinnamon2d
 Categories=GNOME;GTK;System;Core;
 OnlyShowIn=X-Cinnamon;
 NoDisplay=true
diff --git a/data/meson.build b/data/meson.build
@@ -13,22 +13,33 @@ install_subdir(
 
 desktop_conf = configuration_data()
 desktop_conf.set('bindir', join_paths(prefix, bindir))
+desktop_conf.set('libexecdir', join_paths(prefix, libexecdir))
 desktop_conf.set('VERSION', meson.project_version())
 
-desktop = configure_file(
-    input: 'cinnamon.desktop.in.in',
-    output: 'cinnamon.desktop.in',
-    configuration: desktop_conf,
-)
+desktop_files = [
+  'cinnamon.desktop',
+  'cinnamon2d.desktop',
+]
 
-custom_target(
-    'desktop',
-    input: desktop,
-    output: 'cinnamon.desktop',
-    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
-    install: true,
-    install_dir: desktopdir,
-)
+foreach desktop_file : desktop_files
+    desktop = configure_file(
+        input: desktop_file + '.in.in',
+        output: desktop_file + '.in',
+        configuration: desktop_conf,
+    )
+
+    custom_target(
+        desktop_file,
+        input: desktop,
+        output: desktop_file,
+        command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+        install: true,
+        install_dir: desktopdir,
+    )
+endforeach
+
+subdir('xsessions')
+subdir('services')
 
 install_data(
     'org.cinnamon.gschema.xml',
diff --git a/data/services/meson.build b/data/services/meson.build
@@ -0,0 +1,15 @@
+service_files = [
+  'org.cinnamon.CalendarServer.service',
+  'org.Cinnamon.HotplugSniffer.service',
+  'org.Cinnamon.Melange.service',
+  'org.Cinnamon.Slideshow.service',
+]
+
+foreach service_file : service_files
+    configure_file(
+        input: service_file + '.in',
+        output: service_file,
+        configuration: desktop_conf,
+        install_dir: servicedir
+    )
+endforeach
diff --git a/data/services/org.Cinnamon.HotplugSniffer.service.in b/data/services/org.Cinnamon.HotplugSniffer.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.Cinnamon.HotplugSniffer
-Exec=@pkglibexecdir@/cinnamon-hotplug-sniffer
+Exec=@libexecdir@/cinnamon-hotplug-sniffer
diff --git a/data/services/org.Cinnamon.Melange.service.in b/data/services/org.Cinnamon.Melange.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.Cinnamon.Melange
+Exec=@bindir@/cinnamon-looking-glass daemon
diff --git a/data/services/org.Cinnamon.Slideshow.service.in b/data/services/org.Cinnamon.Slideshow.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.Cinnamon.Slideshow
-Exec=/usr/bin/cinnamon-slideshow
+Exec=@bindir@/cinnamon-slideshow
diff --git a/data/services/org.cinnamon.CalendarServer.service.in b/data/services/org.cinnamon.CalendarServer.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.cinnamon.CalendarServer
-Exec=@BINDIR@/cinnamon-calendar-server
+Exec=@bindir@/cinnamon-calendar-server
diff --git a/data/xsessions/cinnamon.desktop.in b/data/xsessions/cinnamon.desktop.in
@@ -2,7 +2,7 @@
 Name=Cinnamon
 Comment=This session logs you into Cinnamon
 Exec=cinnamon-session-cinnamon
-TryExec=/usr/bin/cinnamon
+TryExec=@bindir@/cinnamon
 Icon=
 Type=Application
 
diff --git a/data/xsessions/cinnamon2d.desktop.in b/data/xsessions/cinnamon2d.desktop.in
@@ -2,7 +2,7 @@
 Name=Cinnamon (Software Rendering)
 Comment=This session logs you into Cinnamon (using software rendering)
 Exec=cinnamon-session-cinnamon2d
-TryExec=/usr/bin/cinnamon2d
+TryExec=@bindir@/cinnamon2d
 Icon=
 Type=Application
 X-Ubuntu-Gettext-Domain=cinnamon
diff --git a/data/xsessions/meson.build b/data/xsessions/meson.build
@@ -0,0 +1,13 @@
+session_deskop_files = [
+  'cinnamon.desktop',
+  'cinnamon2d.desktop',
+]
+
+foreach session_deskop_file : session_deskop_files
+    configure_file(
+        input: session_deskop_file + '.in',
+        output: session_deskop_file,
+        configuration: desktop_conf,
+        install_dir: xsessiondir
+    )
+endforeach
diff --git a/files/usr/bin/cinnamon-launcher b/files/usr/bin/cinnamon-launcher
@@ -11,6 +11,7 @@ from setproctitle import setproctitle
 import psutil
 import threading
 import gi
+import shutil
 gi.require_version('Gtk', '3.0')  # noqa
 from gi.repository import Gtk, GLib, Gio, GLib
 
@@ -21,13 +22,13 @@ gettext.install("cinnamon", "/usr/share/locale")
 
 panel_process_name = None
 panel_cmd = None
-if os.path.exists("/usr/bin/mate-panel"):
+if shutil.which("mate-panel"):
     panel_process_name = "mate-panel"
     panel_cmd = "mate-panel --replace &"
-elif os.path.exists("/usr/bin/gnome-panel"):
+elif shutil.which("gnome-panel"):
     panel_process_name = "gnome-panel"
     panel_cmd = "gnome-panel --replace &"
-elif os.path.exists("/usr/bin/tint2"):
+elif shutil.which("tint2"):
     panel_process_name = "tint2"
     panel_cmd = "killall tint2; tint2 &"
 
diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings
@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers:
 import getopt
 import os
 import sys
+import shutil
 
 def usage():
     print("""Usage:
@@ -120,9 +121,9 @@ if len(sys.argv) > 1:
             os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
     elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module):
         os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
-    elif os.path.exists("/usr/bin/cinnamon-control-center"):
+    elif shutil.which("cinnamon-control-center"):
         os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
-    elif os.path.exists("/usr/bin/gnome-control-center"):
+    elif shutil.which("gnome-control-center"):
         print ("Unknown module %s, calling gnome-control-center" % module)
         os.execvp("gnome-control-center", (" ",) + tuple(sys.argv[1:]))
     else:
diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
@@ -9,6 +9,7 @@
 import hashlib
 import mimetypes
 import pickle
+import shutil
 from io import BytesIO
 from xml.etree import ElementTree
 
@@ -187,7 +188,7 @@ def on_module_selected(self):
 
             self.xdg_pictures_directory = os.path.expanduser("~/Pictures")
             xdg_config = os.path.expanduser("~/.config/user-dirs.dirs")
-            if os.path.exists(xdg_config) and os.path.exists("/usr/bin/xdg-user-dir"):
+            if os.path.exists(xdg_config) and shutil.which("xdg-user-dir"):
                 path = subprocess.check_output(["xdg-user-dir", "PICTURES"]).decode("utf-8").rstrip("\n")
                 if os.path.exists(path):
                     self.xdg_pictures_directory = path
diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
@@ -6,6 +6,7 @@
 import os
 import re
 import threading
+import shutil
 from json import loads
 
 from gi.repository import GdkPixbuf
@@ -195,7 +196,7 @@ def on_module_selected(self):
                 widget.pack_end(labelValue, False, False, 0)
                 settings.add_row(widget)
 
-            if os.path.exists("/usr/bin/upload-system-info"):
+            if shutil.which("upload-system-info"):
                 widget = SettingsWidget()
 
                 spinner = Gtk.Spinner(visible=True)
@@ -207,7 +208,7 @@ def on_module_selected(self):
                 widget.pack_start(button, True, True, 0)
                 settings.add_row(widget)
 
-            if os.path.exists("/usr/bin/inxi"):
+            if shutil.which("inxi"):
                 
                 widget = SettingsWidget()
 
diff --git a/files/usr/share/dbus-1/services/org.Cinnamon.Melange.service b/files/usr/share/dbus-1/services/org.Cinnamon.Melange.service
diff --git a/meson.build b/meson.build
@@ -13,12 +13,12 @@ libdir = join_paths(prefix, get_option('libdir'))
 includedir = get_option('includedir')
 libexecdir = get_option('libexecdir')
 desktopdir = join_paths(datadir, 'applications')
+xsessiondir = join_paths(datadir, 'xsessions')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 pkglibdir = join_paths(libdir, meson.project_name().to_lower())
 servicedir = join_paths(datadir, 'dbus-1', 'services')
 pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
 po_dir = join_paths(meson.source_root(), 'po')
-dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', datadir])
 
 # dependencies
 cjs = dependency('cjs-1.0', version: '>= 4.8.0')
diff --git a/src/hotplug-sniffer/meson.build b/src/hotplug-sniffer/meson.build
@@ -22,13 +22,3 @@ executable(
     install: true,
     install_dir: libexecdir,
 )
-
-sniffer_conf = configuration_data()
-sniffer_conf.set('pkglibexecdir', join_paths(prefix, libexecdir))
-
-configure_file(
-    input: 'org.Cinnamon.HotplugSniffer.service.in',
-    output: 'org.Cinnamon.HotplugSniffer.service',
-    configuration: sniffer_conf,
-    install_dir: servicedir,
-)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[D-BUS Service]`
	`2`	`+Name=org.Cinnamon.Melange`
	`3`	`+Exec=@bindir@/cinnamon-looking-glass daemon`