diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-11-12 08:08:21 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-11-14 11:09:17 +0100 |
| commit | c1b2a176b8ac0d18ac8080c094d38ef78e2a7376 (patch) | |
| tree | a90427e8ecb988933a7f09fb0652d76a8f5c1d9a | |
| parent | bdc812d0e358c013c0f9c993d2b9fac3849e15f0 (diff) | |
| download | mullvadvpn-c1b2a176b8ac0d18ac8080c094d38ef78e2a7376.tar.xz mullvadvpn-c1b2a176b8ac0d18ac8080c094d38ef78e2a7376.zip | |
Stop checking if the GUI should be killed before app install on macOS
Clean up the pre-install script on macOS. The GUI can and should be
unconditionally killed before running the install script since we have
dropped support for app version `2022.5`.
| -rwxr-xr-x | dist-assets/pkg-scripts/preinstall | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/dist-assets/pkg-scripts/preinstall b/dist-assets/pkg-scripts/preinstall index 1b61ff3ed5..9c5b2bf3f1 100755 --- a/dist-assets/pkg-scripts/preinstall +++ b/dist-assets/pkg-scripts/preinstall @@ -44,10 +44,4 @@ rm "$NEW_CACHE_DIR/api-ip-address.txt" || true dscl . -delete /groups/mullvad-exclusion &>/dev/null || true # Kill the GUI before proceeding with the upgrade. -# -# When we drop support for all app versions older than 2022.5, we can skip this -# check and always try to kill the GUI. -if "$INSTALL_DIR/Mullvad VPN.app/Contents/Resources/mullvad-setup" is-older-version 2022.5; then - pkill -x "Mullvad VPN" || echo "Unable to kill GUI, not running?" - sleep 1 -fi +pkill -x "Mullvad VPN" && sleep 1 || echo "Unable to kill GUI, not running?" |