summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-08-07 15:08:19 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-08-08 17:05:18 +0200
commitd3b642dc0c1b10bb6799f4d325b17ed758f0718b (patch)
tree4a01e855c64a399e8b67f8034e635feac68f498b
parent5f67f85907b95ebe28f5e9d93d9a460067230a90 (diff)
downloadmullvadvpn-d3b642dc0c1b10bb6799f4d325b17ed758f0718b.tar.xz
mullvadvpn-d3b642dc0c1b10bb6799f4d325b17ed758f0718b.zip
Disable compression after backup restore hook has been initialized
-rwxr-xr-xbuild.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/build.sh b/build.sh
index 74c9176172..f4e4c29b77 100755
--- a/build.sh
+++ b/build.sh
@@ -59,14 +59,6 @@ else
echo "Removing old Rust build artifacts"
cargo +stable clean
fi
-if [[ "${1:-""}" == "--dev-build" ]]; then
- # Disable installer compression on *explicit* dev builds.
- # This does not disable compression on build server builds, since they
- # always run without --dev-buid.
- echo "Disabling compression of installer in this dev build"
- cp gui/electron-builder.yml gui/electron-builder.yml.bak
- echo "compression: store" >> gui/electron-builder.yml
-fi
echo "Building Mullvad VPN $PRODUCT_VERSION"
SEMVER_VERSION=$(echo $PRODUCT_VERSION | sed -Ee 's/($|-.*)/.0\1/g')
@@ -86,6 +78,15 @@ function restore_metadata_backups() {
}
trap 'restore_metadata_backups' EXIT
+if [[ "${1:-""}" == "--dev-build" ]]; then
+ # Disable installer compression on *explicit* dev builds.
+ # This does not disable compression on build server builds, since they
+ # always run without --dev-buid.
+ echo "Disabling compression of installer in this dev build"
+ cp gui/electron-builder.yml gui/electron-builder.yml.bak
+ echo "compression: store" >> gui/electron-builder.yml
+fi
+
sed -i.bak \
-Ee "s/\"version\": \"[^\"]+\",/\"version\": \"$SEMVER_VERSION\",/g" \
gui/package.json