use cmake formatting to template, avoids the custom binary

5 files changed, 17 insertions, 14 deletions

diff --git a/dist/linux/app.desktop.in b/dist/linux/app.desktop.in
index aefb5c9cd..c39164158 100644
--- a/dist/linux/app.desktop.in
+++ b/dist/linux/app.desktop.in
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Version=1.0
-Name=@@NAME@@
+Name=@NAME@
 Type=Application
 Comment=A terminal emulator
-TryExec=@@GHOSTTY@@
-Exec=@@GHOSTTY@@ --launched-from=desktop
+TryExec=@GHOSTTY@
+Exec=@GHOSTTY@ --launched-from=desktop
 Icon=com.mitchellh.ghostty
 Categories=System;TerminalEmulator;
 Keywords=terminal;tty;pty;
 StartupNotify=true
-StartupWMClass=@@APPID@@
+StartupWMClass=@APPID@
 Terminal=false
 Actions=new-window;
 X-GNOME-UsesNotifications=true
@@ -22,4 +22,4 @@ DBusActivatable=true
 
 [Desktop Action new-window]
 Name=New Window
-Exec=@@GHOSTTY@@ --launched-from=desktop
+Exec=@GHOSTTY@ --launched-from=desktop
diff --git a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
index 7bfa30518..00d99adb2 100644
--- a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
+++ b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>@@APPID@@</id>
-  <launchable type="desktop-id">@@APPID@@.desktop</launchable>
-  <name>@@NAME@@</name>
+  <id>@APPID@id>
+  <launchable type="desktop-id">@APPID@desktop</launchable>
+  <name>@NAME@name>
   <url type="homepage">https://ghostty.org</url>
   <url type="help">https://ghostty.org/docs</url>
   <url type="bugtracker">https://github.com/ghostty-org/ghostty/discussions</url>
diff --git a/dist/linux/dbus.service.flatpak.in b/dist/linux/dbus.service.flatpak.in
new file mode 100644
index 000000000..213cda78f
--- /dev/null
+++ b/dist/linux/dbus.service.flatpak.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=@APPID@
+Exec=@GHOSTTY@ --launched-from=dbus
diff --git a/dist/linux/dbus.service.in b/dist/linux/dbus.service.in
index a11ab2c13..85b7c425c 100644
--- a/dist/linux/dbus.service.in
+++ b/dist/linux/dbus.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=@@APPID@@
-SystemdService=@@APPID@@.service
-Exec=@@GHOSTTY@@ --launched-from=dbus
+Name=@APPID@
+SystemdService=@APPID@service
+Exec=@GHOSTTY@ --launched-from=dbus
diff --git a/dist/linux/systemd.service.in b/dist/linux/systemd.service.in
index ede2174a2..b0ef3d59a 100644
--- a/dist/linux/systemd.service.in
+++ b/dist/linux/systemd.service.in
@@ -1,7 +1,7 @@
 [Unit]
-Description=@@NAME@@
+Description=@NAME@
 
 [Service]
 Type=dbus
-BusName=@@APPID@@
-ExecStart=@@GHOSTTY@@ --launched-from=systemd
+BusName=@APPID@
+ExecStart=@GHOSTTY@ --launched-from=systemd