summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-08-07 15:42:20 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-08-08 17:05:18 +0200
commitf083bb54740abdf444676c2c5c97f85711b64bba (patch)
treea4f20e2d47f7a6972fb0b82956bc40f795cb5224
parent91aeb811a770e59f5917b8e7df7a3f7be402635b (diff)
downloadmullvadvpn-f083bb54740abdf444676c2c5c97f85711b64bba.tar.xz
mullvadvpn-f083bb54740abdf444676c2c5c97f85711b64bba.zip
Only restore electron-builder.yml.bak on dev build
-rwxr-xr-xbuild.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index f4e4c29b77..540e0ffaec 100755
--- a/build.sh
+++ b/build.sh
@@ -65,6 +65,9 @@ SEMVER_VERSION=$(echo $PRODUCT_VERSION | sed -Ee 's/($|-.*)/.0\1/g')
function restore_metadata_backups() {
pushd "$SCRIPT_DIR"
+ if [[ "${1:-""}" == "--dev-build" ]]; then
+ mv gui/electron-builder.yml.bak gui/electron-builder.yml || true
+ fi
mv gui/package.json.bak gui/package.json || true
mv gui/package-lock.json.bak gui/package-lock.json || true
mv Cargo.lock.bak Cargo.lock || true
@@ -73,7 +76,6 @@ function restore_metadata_backups() {
mv mullvad-problem-report/Cargo.toml.bak mullvad-problem-report/Cargo.toml || true
mv talpid-openvpn-plugin/Cargo.toml.bak talpid-openvpn-plugin/Cargo.toml || true
mv dist-assets/windows/version.h.bak dist-assets/windows/version.h || true
- mv gui/electron-builder.yml.bak gui/electron-builder.yml || true
popd
}
trap 'restore_metadata_backups' EXIT