diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-11-09 19:04:29 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-11-09 19:04:29 +0100 |
| commit | 0ad0b36259b7a09e35c9d4b4a2f562d8bd4cb7e1 (patch) | |
| tree | 907665b3e31313ff89934b439ee139ad0b801331 | |
| parent | af24fbacb6b85f93286e28cea8aefae7c698bf07 (diff) | |
| parent | 44835fa4d445d3dd8893a98ed29944d4e280d176 (diff) | |
| download | mullvadvpn-0ad0b36259b7a09e35c9d4b4a2f562d8bd4cb7e1.tar.xz mullvadvpn-0ad0b36259b7a09e35c9d4b4a2f562d8bd4cb7e1.zip | |
Merge branch 'cleanup-after-rpm'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | dist-assets/linux/after-remove.sh | 2 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ced52b7ffb..9543dfba8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ Line wrap the file at 100 chars. Th #### Linux - Remove last filesystem dependency of early boot blocking unit. +- Ensure RPM package removes all application directories when uninstalled. #### Windows - Ignore adapters that have no valid GUID when removing obsolete Wintun interfaces during install. diff --git a/dist-assets/linux/after-remove.sh b/dist-assets/linux/after-remove.sh index 22c9529982..8dfe875a46 100644 --- a/dist-assets/linux/after-remove.sh +++ b/dist-assets/linux/after-remove.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash set -eu -echo "Running after-remove.sh" - function remove_logs_and_cache { rm -r --interactive=never /var/log/mullvad-vpn/ || \ echo "Failed to remove mullvad-vpn logs" diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 5ced2ed563..b93f42b026 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -202,6 +202,7 @@ const config = { rpm: { fpm: [ + '--directories=/opt/Mullvad VPN/', '--before-install', distAssets('linux/before-install.sh'), '--before-remove', |