diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-07-17 15:46:01 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-07-17 15:46:01 +0200 |
| commit | c7e03bb87fd22f04d0c2d78359e6c0e8c6a9a7a7 (patch) | |
| tree | e819d1508214f3c034417162cd78e0b40f4dc5f8 | |
| parent | 0101b12999c34b70b79d0da0045306fb0e017877 (diff) | |
| parent | 870d2b6f8270442d7af74d87c872645e69093656 (diff) | |
| download | mullvadvpn-c7e03bb87fd22f04d0c2d78359e6c0e8c6a9a7a7.tar.xz mullvadvpn-c7e03bb87fd22f04d0c2d78359e6c0e8c6a9a7a7.zip | |
Merge branch 'fix-macos-sed-compatibility'
| -rwxr-xr-x | build.sh | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -18,7 +18,7 @@ source env.sh if [[ "${1:-""}" != "--dev-build" ]]; then - REQUIRED_RUSTC_VERSION="rustc 1.26.2 (594fb253c 2018-06-01)" + REQUIRED_RUSTC_VERSION="rustc 1.27.1 (5f2b325f6 2018-07-07)" if [[ $RUSTC_VERSION != $REQUIRED_RUSTC_VERSION ]]; then echo "You are running the wrong Rust compiler version." @@ -87,8 +87,7 @@ sed -i.bak \ mullvad-cli/Cargo.toml \ mullvad-problem-report/Cargo.toml -SEMVER_ARRAY=($(echo $SEMVER_VERSION | sed -r 's/[.-]+/ /g')) - +SEMVER_ARRAY=($(echo $SEMVER_VERSION | sed -Ee 's/[.-]+/ /g')) SEMVER_MAJOR=${SEMVER_ARRAY[0]} SEMVER_MINOR=${SEMVER_ARRAY[1]} SEMVER_PATCH=${SEMVER_ARRAY[2]} |