diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-03-18 22:44:45 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-03-19 10:35:45 +0100 |
| commit | 372b061e1e5cb57ad9315fe56441aacb9df8a34f (patch) | |
| tree | 206862e992e3cd2d659fb8cfab2b8550cc869806 | |
| parent | 3f561d57da4471ee2c641b51b27a4b0354014e68 (diff) | |
| download | mullvadvpn-372b061e1e5cb57ad9315fe56441aacb9df8a34f.tar.xz mullvadvpn-372b061e1e5cb57ad9315fe56441aacb9df8a34f.zip | |
Set `set +x` while doing things that does not matter if they fail
| -rw-r--r--[-rwxr-xr-x] | version-metadata.sh | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/version-metadata.sh b/version-metadata.sh index f2bed4f8a2..f6803ea424 100755..100644 --- a/version-metadata.sh +++ b/version-metadata.sh @@ -64,39 +64,43 @@ EOF } function restore_backup { + set +e # Electron GUI - mv gui/package.json.bak gui/package.json || true - mv gui/package-lock.json.bak gui/package-lock.json || true + mv gui/package.json.bak gui/package.json + mv gui/package-lock.json.bak gui/package-lock.json # Rust crates - mv mullvad-daemon/Cargo.toml.bak mullvad-daemon/Cargo.toml || true - mv mullvad-cli/Cargo.toml.bak mullvad-cli/Cargo.toml || true - mv mullvad-problem-report/Cargo.toml.bak mullvad-problem-report/Cargo.toml || true - mv mullvad-setup/Cargo.toml.bak mullvad-setup/Cargo.toml || true - mv talpid-openvpn-plugin/Cargo.toml.bak talpid-openvpn-plugin/Cargo.toml || true + mv mullvad-daemon/Cargo.toml.bak mullvad-daemon/Cargo.toml + mv mullvad-cli/Cargo.toml.bak mullvad-cli/Cargo.toml + mv mullvad-problem-report/Cargo.toml.bak mullvad-problem-report/Cargo.toml + mv mullvad-setup/Cargo.toml.bak mullvad-setup/Cargo.toml + mv talpid-openvpn-plugin/Cargo.toml.bak talpid-openvpn-plugin/Cargo.toml # Windows C++ - mv dist-assets/windows/version.h.bak dist-assets/windows/version.h || true + mv dist-assets/windows/version.h.bak dist-assets/windows/version.h # Android if [[ ("$(uname -s)" == "Linux") ]]; then - mv android/build.gradle.bak android/build.gradle || true + mv android/build.gradle.bak android/build.gradle fi + set -e } function delete_backup { + set +e # Electron GUI - rm gui/package.json.bak || true - rm gui/package-lock.json.bak || true + rm gui/package.json.bak + rm gui/package-lock.json.bak # Rust crates - rm mullvad-daemon/Cargo.toml.bak || true - rm mullvad-cli/Cargo.toml.bak || true - rm mullvad-problem-report/Cargo.toml.bak || true - rm mullvad-setup/Cargo.toml.bak || true - rm talpid-openvpn-plugin/Cargo.toml.bak || true + rm mullvad-daemon/Cargo.toml.bak + rm mullvad-cli/Cargo.toml.bak + rm mullvad-problem-report/Cargo.toml.bak + rm mullvad-setup/Cargo.toml.bak + rm talpid-openvpn-plugin/Cargo.toml.bak # Windows C++ - rm dist-assets/windows/version.h.bak || true + rm dist-assets/windows/version.h.bak # Android if [[ ("$(uname -s)" == "Linux") ]]; then - rm android/build.gradle.bak || true + rm android/build.gradle.bak fi + set -e } case "$1" in |