diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-09-06 21:01:08 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-07 14:45:56 +0200 |
| commit | 09b52755c3b5143cd8ee6f364e265283a34bf8ea (patch) | |
| tree | dd8a4fbd8c1ad5b22b20e528a7e55570216439e9 | |
| parent | b7b2091ccb77801db8e274715286e0df1eee8782 (diff) | |
| download | mullvadvpn-09b52755c3b5143cd8ee6f364e265283a34bf8ea.tar.xz mullvadvpn-09b52755c3b5143cd8ee6f364e265283a34bf8ea.zip | |
Make macOS postinstall script kill any running GUI
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rwxr-xr-x | dist-assets/pkg-scripts/postinstall | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1893edffff..72c377ae00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,8 @@ Line wrap the file at 100 chars. Th #### macOS - Fix edge cases when window's arrow appeared misaligned and pointed to the wrong menubar item. +- Make the pkg installer kill any running GUI process after installation is done. Prevents + accidentally running an old GUI with a newer daemon. ### Changed - The "Buy more credit" button is changed to open a dedicated account login page instead of one diff --git a/dist-assets/pkg-scripts/postinstall b/dist-assets/pkg-scripts/postinstall index fd3752ae3b..e213c73b62 100755 --- a/dist-assets/pkg-scripts/postinstall +++ b/dist-assets/pkg-scripts/postinstall @@ -42,6 +42,8 @@ DAEMON_PLIST=$(cat <<-EOM EOM ) +pkill -x "Mullvad VPN" || echo "Unable to kill GUI, not running?" +sleep 1 launchctl unload -w $DAEMON_PLIST_PATH echo "$DAEMON_PLIST" > $DAEMON_PLIST_PATH launchctl load -w $DAEMON_PLIST_PATH |