Skip to content

fix: make macOS desktop self-update swap+relaunch fail-fast and recoverable #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OmarB97 merged 1 commit into from
Jun 10, 2026
Merged

fix: make macOS desktop self-update swap+relaunch fail-fast and recoverable #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions apps/desktop/electron/main.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,23 +1922,33 @@ async function applyUpdatesPosixInApp() {
emitUpdateProgress({ stage: 'restart', message: 'Installing the updated app and restarting…', percent: 95 })

// Detached swapper: wait for THIS process to exit (so the bundle is free),
// ditto the rebuilt app over the running one, clear quarantine, relaunch.
// then atomically replace the running .app, clear quarantine, and reopen it.
// If the swap fails, fall back to launching the freshly rebuilt bundle
// directly so we do not leave the user with a dead quit.
const swapScript = `#!/bin/bash
set -u
set -euo pipefail
APP_PID=${process.pid}
SRC=${shellQuote(rebuiltApp)}
DST=${shellQuote(targetApp)}
for _ in $(seq 1 240); do
kill -0 "$APP_PID" 2>/dev/null || break
sleep 0.5
done
cleanup() { rm -rf "$DST.hermes-update-old" 2>/dev/null || true; }
trap cleanup EXIT
if [ "$SRC" != "$DST" ]; then
if /usr/bin/ditto "$SRC" "$DST.hermes-update-new"; then
rm -rf "$DST.hermes-update-old" 2>/dev/null || true
mv "$DST" "$DST.hermes-update-old" 2>/dev/null || rm -rf "$DST"
mv "$DST.hermes-update-new" "$DST"
rm -rf "$DST.hermes-update-old" 2>/dev/null || true
if ! /usr/bin/ditto "$SRC" "$DST.hermes-update-new"; then
echo "[updates] ditto failed" >&2
/usr/bin/open "$SRC"
exit 0
fi
mv "$DST" "$DST.hermes-update-old" 2>/dev/null || rm -rf "$DST"
if ! mv "$DST.hermes-update-new" "$DST"; then
echo "[updates] destination replace failed" >&2
/usr/bin/open "$SRC"
exit 0
fi
rm -rf "$DST.hermes-update-old" 2>/dev/null || true
fi
/usr/bin/xattr -dr com.apple.quarantine "$DST" 2>/dev/null || true
/usr/bin/open "$DST"
Expand Down
Loading