fix(core): restart cannot handle binary name change on macOS
#10991
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tauri v2 changed the default binary name of the bundled apps (no longer follows the productName, just uses the default name from Cargo instead). This breaks the `restart` function, which expects the current binary path to match the new one. Due to this change, the restart() function for macOS is broken - the .app is correctly replaced even if the productName changed, but the restart() function cannot handle the new binary path. This change adds a simple check on macOS to read the `Contents/MacOS` folder and if it only contains a single binary, we use it to restart instead. This inference cannot be used if there's sidecars, so in this case we just let the existing implementation run and if it fails to restart, we do not panic but only warn and exit instead. AppImage updates are not affected by this, and the Windows installer is responsible for restarting, so this change is only applied to macOS binaries.
Package Changes Through 5cac772There are 3 changes which include tauri-bundler with minor, tauri with minor, tauri-build with patch Planned Package VersionsThe following package releases are the planned based on the context of changes in this pull request.
Add another change file through the GitHub UI by following this link. Read about change files or the docs at github.com/jbolda/covector |
amrbashir
reviewed
Sep 13, 2024
core/tauri/src/api/process.rs
Outdated
Comment on lines
85
to
86
| // on macOS on updates the binary name might have changed | ||
| // so we'll read the Contents/MacOS folder instead to infer the actual binary path |
There was a problem hiding this comment.
Can we read Contents/Info.plist to determine new binary name?
There was a problem hiding this comment.
ohhhhhh we can.. let's do that
There was a problem hiding this comment.
Amr the no-Apple dev that knows more about Apple than any other dev
amrbashir
previously approved these changes
Sep 14, 2024
amrbashir
approved these changes
Sep 14, 2024
lucasfernog
added a commit
that referenced
this pull request
Sep 14, 2024
This was referenced Sep 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tauri v2 changed the default binary name of the bundled apps (no longer follows the productName, just uses the default name from Cargo instead). This breaks the
restartfunction, which expects the current binary path to match the new one.Due to this change, the restart() function for macOS is broken - the .app is correctly replaced even if the productName changed, but the restart() function cannot handle the new binary path. This change adds a simple check on macOS to read the
Contents/MacOSfolder and if it only contains a single binary, we use it to restart instead. This inference cannot be used if there's sidecars, so in this case we just let the existing implementation run and if it fails to restart, we do not panic but only warn and exit instead.AppImage updates are not affected by this, and the Windows installer is responsible for restarting, so this change is only applied to macOS binaries.