diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-04-15 12:57:26 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-04-23 13:03:49 +0200 |
| commit | 76b41fa149771f603faa73e0c4a4c3e9b82f3f46 (patch) | |
| tree | 6b83f9a3ac48567b0e616123503252271d1e2fe7 /dist-assets/pkg-scripts/postinstall | |
| parent | 4c5dbdce39e95206b7cbb85f47318aafa3d2c97e (diff) | |
| download | mullvadvpn-76b41fa149771f603faa73e0c4a4c3e9b82f3f46.tar.xz mullvadvpn-76b41fa149771f603faa73e0c4a4c3e9b82f3f46.zip | |
Detect and run cleanup when Mullvad app is removed
Co-authored-by: Joakim Hulthe <joakim.hulthe@mullvad.net>
Diffstat (limited to 'dist-assets/pkg-scripts/postinstall')
| -rwxr-xr-x | dist-assets/pkg-scripts/postinstall | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/dist-assets/pkg-scripts/postinstall b/dist-assets/pkg-scripts/postinstall index 3f498baeb8..6f6f6f9904 100755 --- a/dist-assets/pkg-scripts/postinstall +++ b/dist-assets/pkg-scripts/postinstall @@ -19,17 +19,8 @@ exec > $LOG_DIR/postinstall.log 2>&1 echo "Running postinstall at $(date)" -# Run CLI to force macOS to check the certificate, and shut down the already running daemon, if one -# exists. -# This is a temporary workaround. After 2023.3, we switched from signing with Amagicom AB to -# Mullvad VPN AB certificates. This could potentially be removed when older versions are no longer -# supported. -"$INSTALL_DIR/Mullvad VPN.app/Contents/Resources/mullvad" &>/dev/null || true -"$TMPDIR/mullvad-setup" prepare-restart &>/dev/null || \ - echo "Failed to send 'prepare-restart' command to old mullvad-daemon" - # NOTE: This path must be kept in sync with the path defined -# in mullvad-daemon/src/macos_launch_daemon.rs +# in mullvad-daemon/src/macos_launch_daemon.rs and preinstall DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.mullvad.daemon.plist" DAEMON_PLIST=$(cat <<-EOM @@ -79,7 +70,6 @@ else FISH_COMPLETIONS_DIR="/usr/local/share/fish/vendor_completions.d/" fi -launchctl unload -w $DAEMON_PLIST_PATH cp "$LOG_DIR/daemon.log" "$LOG_DIR/old-install-daemon.log" \ || echo "Failed to copy old daemon log" |