fix: self-update on macOS

scripts/util/Platform.cs

@@ -0,0 +1,22 @@
+using System.IO;
+using Godot;
+
+namespace util;
+
+public static class Platform
+{
+    /// <summary>
+    /// Path to the running .app bundle on macOS, the executable lives at Rhythia.app/Contents/MacOS/Rhythia
+    /// </summary>
+    public static string MacAppBundlePath => Path.GetFullPath(Path.Combine(OS.GetExecutablePath(), "../../.."));
+
+    /// <summary>
+    /// Wraps a value in single quotes so it is passed to /bin/sh as one literal argument
+    /// </summary>
+    public static string ShellQuote(string value) => $"'{value.Replace("'", "'\\''")}'";
+
+    /// <summary>
+    /// Shell snippet that blocks until the current process has exited
+    /// </summary>
+    public static string WaitForExitScript => $"while kill -0 {OS.GetProcessId()} 2>/dev/null; do sleep 0.1; done";
+}

scripts/util/Platform.cs.uid

@@ -0,0 +1 @@
+uid://d0b88m1ycctvg

scripts/util/Releases.cs

@@ -4,6 +4,7 @@
 using Godot;
 using Octokit;
 using Updatum;
+using util;
 
 public class Releases
 {
@@ -50,6 +51,36 @@ public static async Task<bool> InstallUpdateAsync(UpdatumDownloadedAsset asset)
             return false;
         }
 
+        if (OS.GetName() == "macOS")
+        {
+            return installMacUpdate(asset);
+        }
+
         return await MANAGER.InstallUpdateAsync(asset);
     }
+
+    // Updatum finds the .app through AppContext.BaseDirectory, which Godot points at Contents/Resources,
+    // so it would sync the update inside the running bundle instead of replacing it
+    private static bool installMacUpdate(UpdatumDownloadedAsset asset)
+    {
+        if (asset == null || !asset.FileExists)
+        {
+            return false;
+        }
+
+        string app = Platform.ShellQuote(Platform.MacAppBundlePath);
+        string zip = Platform.ShellQuote(asset.FilePath);
+
+        string script =
+            $"{Platform.WaitForExitScript}; "
+            + $"tmp=$(mktemp -d) && ditto -x -k {zip} \"$tmp\" "
+            + "&& new=$(find \"$tmp\" -maxdepth 1 -name '*.app' | head -n 1) && [ -n \"$new\" ] "
+            + $"&& mv {app} \"$tmp/old.app\" && {{ ditto \"$new\" {app} || mv \"$tmp/old.app\" {app}; }}; "
+            + $"xattr -dr com.apple.quarantine {app}; rm -rf \"$tmp\"; open {app}";
+
+        OS.CreateProcess("/bin/sh", ["-c", script]);
+        ((SceneTree)Engine.GetMainLoop()).Quit();
+
+        return true;
+    }
 }