diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-08-06 12:03:58 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-08-06 13:07:53 +0200 |
| commit | 6f5bb75b9dfe14bf698afc774d98568e9f40bdb8 (patch) | |
| tree | 5eb58f9efd031140d85bbd1224c2317018adbb9e /dist-assets/pkg-scripts | |
| parent | bdc01739bfdc205a6d3ba26b6cbfe69989d718cd (diff) | |
| download | mullvadvpn-6f5bb75b9dfe14bf698afc774d98568e9f40bdb8.tar.xz mullvadvpn-6f5bb75b9dfe14bf698afc774d98568e9f40bdb8.zip | |
Adding migration code for old paths
Diffstat (limited to 'dist-assets/pkg-scripts')
| -rwxr-xr-x | dist-assets/pkg-scripts/postinstall | 2 | ||||
| -rwxr-xr-x | dist-assets/pkg-scripts/preinstall | 40 |
2 files changed, 35 insertions, 7 deletions
diff --git a/dist-assets/pkg-scripts/postinstall b/dist-assets/pkg-scripts/postinstall index a56cc90e5c..fd3752ae3b 100755 --- a/dist-assets/pkg-scripts/postinstall +++ b/dist-assets/pkg-scripts/postinstall @@ -2,7 +2,7 @@ set -eu -LOG_DIR=/var/log/mullvad-daemon +LOG_DIR=/var/log/mullvad-vpn mkdir -p $LOG_DIR exec 2>&1 > $LOG_DIR/postinstall.log diff --git a/dist-assets/pkg-scripts/preinstall b/dist-assets/pkg-scripts/preinstall index b64746c8a8..b9c5e69b82 100755 --- a/dist-assets/pkg-scripts/preinstall +++ b/dist-assets/pkg-scripts/preinstall @@ -2,7 +2,7 @@ set -eux -LOG_DIR=/var/log/mullvad-daemon +LOG_DIR=/var/log/mullvad-vpn mkdir -p $LOG_DIR exec 2>&1 > $LOG_DIR/preinstall.log @@ -21,28 +21,56 @@ fi # Migrate settings from <=2018.1 paths OLD_SETTINGS_DIR="$HOME/Library/Application Support/mullvad-daemon" -NEW_SETTINGS_DIR="/etc/mullvad-daemon" +NEW_SETTINGS_DIR="/etc/mullvad-vpn" if [ -d "$OLD_SETTINGS_DIR" ]; then echo "Found old setting dir $OLD_SETTINGS_DIR. Moving to $NEW_SETTINGS_DIR" mkdir -p "$NEW_SETTINGS_DIR" mv "$OLD_SETTINGS_DIR/settings.json" "$NEW_SETTINGS_DIR/settings.json" || \ echo "Unable to migrate settings, not present in old dir?" - rm -r "$OLD_SETTINGS_DIR" + rm -rf "$OLD_SETTINGS_DIR" +fi + +# Migrate settings from <=2018.2-betaX paths +OLD_SETTINGS_DIR="/etc/mullvad-daemon" +NEW_SETTINGS_DIR="/etc/mullvad-vpn" +if [ -d "$OLD_SETTINGS_DIR" ]; then + echo "Found old setting dir $OLD_SETTINGS_DIR. Moving to $NEW_SETTINGS_DIR" + mkdir -p "$NEW_SETTINGS_DIR" + mv "$OLD_SETTINGS_DIR/settings.json" "$NEW_SETTINGS_DIR/settings.json" || \ + echo "Unable to migrate settings, not present in old dir?" + rm -rf "$OLD_SETTINGS_DIR" fi # Delete logs from <=2018.1 paths OLD_LOG_DIR="$HOME/Library/Logs/MullvadVPN" if [ -d "$OLD_LOG_DIR" ]; then echo "Found old log dir $OLD_LOG_DIR. Deleting" - rm -r "$OLD_LOG_DIR" + rm -rf "$OLD_LOG_DIR" +fi + +# Delete logs from <=2018.2-betaX paths +OLD_LOG_DIR="/var/log/mullvad-daemon" +if [ -d "$OLD_LOG_DIR" ]; then + echo "Found old log dir $OLD_LOG_DIR. Deleting" + rm -rf "$OLD_LOG_DIR" fi # Migrate cache files from <=2018.1 paths OLD_CACHE_DIR="$HOME/Library/Caches/mullvad-daemon" -NEW_CACHE_DIR="/var/root/Library/Caches/mullvad-daemon" +NEW_CACHE_DIR="/var/root/Library/Caches/mullvad-vpn" +if [ -d "$OLD_CACHE_DIR" ]; then + echo "Found old cache dir at $OLD_CACHE_DIR, moving to $NEW_CACHE_DIR" + mkdir -p "$NEW_CACHE_DIR" + mv "$OLD_CACHE_DIR"/* "$NEW_CACHE_DIR/" || echo "Unable to migrate cache. No cache files?" + rm -rf "$OLD_CACHE_DIR" +fi + +# Migrate cache files from <=2018.2-betaX paths +OLD_CACHE_DIR="/var/root/Library/Caches/mullvad-daemon" +NEW_CACHE_DIR="/var/root/Library/Caches/mullvad-vpn" if [ -d "$OLD_CACHE_DIR" ]; then echo "Found old cache dir at $OLD_CACHE_DIR, moving to $NEW_CACHE_DIR" mkdir -p "$NEW_CACHE_DIR" mv "$OLD_CACHE_DIR"/* "$NEW_CACHE_DIR/" || echo "Unable to migrate cache. No cache files?" - rm -r "$OLD_CACHE_DIR" + rm -rf "$OLD_CACHE_DIR" fi |