diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-07-07 08:14:42 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-07-07 08:14:42 +0200 |
| commit | f35064df75f45c9846e6bf2b82bb3c839ee6ba35 (patch) | |
| tree | d5c8bdf9cb604dbeefbac564a491ac0e14c2910c | |
| parent | 5300f1663559ebd7a87c699db8e858d13e6fa556 (diff) | |
| parent | cb35182b0f2a2a0d353ba0100be682c4eacfdb97 (diff) | |
| download | mullvadvpn-f35064df75f45c9846e6bf2b82bb3c839ee6ba35.tar.xz mullvadvpn-f35064df75f45c9846e6bf2b82bb3c839ee6ba35.zip | |
Merge branch 'revert-macos-zsh-completions'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rwxr-xr-x | dist-assets/pkg-scripts/postinstall | 6 | ||||
| -rwxr-xr-x | dist-assets/uninstall_macos.sh | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e06fa3600..2f359c675a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,6 @@ Line wrap the file at 100 chars. Th ### Changed #### macOS - Use a local DNS resolver on the 127.0.0.0/8 network, regardless of macOS version. -- Install zsh completions in `/opt/homebrew` if available. ### Fixed #### macOS diff --git a/dist-assets/pkg-scripts/postinstall b/dist-assets/pkg-scripts/postinstall index 2c067efab1..6f6f6f9904 100755 --- a/dist-assets/pkg-scripts/postinstall +++ b/dist-assets/pkg-scripts/postinstall @@ -62,11 +62,7 @@ DAEMON_PLIST=$(cat <<-EOM EOM ) -if [[ -d "/opt/homebrew/share/zsh/site-functions/" ]]; then - ZSH_COMPLETIONS_DIR="/opt/homebrew/share/zsh/site-functions/" -else - ZSH_COMPLETIONS_DIR="/usr/local/share/zsh/site-functions/" -fi +ZSH_COMPLETIONS_DIR="/usr/local/share/zsh/site-functions/" if [[ -d "/opt/homebrew/share/fish/vendor_completions.d/" ]]; then FISH_COMPLETIONS_DIR="/opt/homebrew/share/fish/vendor_completions.d/" diff --git a/dist-assets/uninstall_macos.sh b/dist-assets/uninstall_macos.sh index 085885f836..0983ee43ae 100755 --- a/dist-assets/uninstall_macos.sh +++ b/dist-assets/uninstall_macos.sh @@ -36,10 +36,10 @@ sudo /Applications/Mullvad\ VPN.app/Contents/Resources/mullvad-setup reset-firew sudo /Applications/Mullvad\ VPN.app/Contents/Resources/mullvad-setup remove-device || echo "Failed to remove device from account" echo "Removing zsh shell completion symlink ..." -sudo rm -f "/opt/homebrew/share/zsh/site-functions/_mullvad" -sudo rm -f "/usr/local/share/zsh/site-functions/_mullvad" +sudo rm -f /usr/local/share/zsh/site-functions/_mullvad echo "Removing fish shell completion symlink ..." + sudo rm -f "/opt/homebrew/share/fish/vendor_completions.d/mullvad.fish" sudo rm -f "/usr/local/share/fish/vendor_completions.d/mullvad.fish" |