diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-20 17:45:08 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-20 17:45:08 -0300 |
| commit | 43bf1bdcf423d48e04cf757e01c1434271f30145 (patch) | |
| tree | 0102b05f7271e5533fa4d15c31ad42206e818e7c | |
| parent | c58353a281eef4af089ff25c4a0bed558f4c9fdd (diff) | |
| parent | adaea7758e81c7409b75a94188e2ea3575b21081 (diff) | |
| download | mullvadvpn-43bf1bdcf423d48e04cf757e01c1434271f30145.tar.xz mullvadvpn-43bf1bdcf423d48e04cf757e01c1434271f30145.zip | |
Merge branch 'fix-build-apk-script'
| -rwxr-xr-x | build-apk.sh | 4 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| -rwxr-xr-x | prepare_release.sh | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | version-metadata.sh | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/build-apk.sh b/build-apk.sh index b8c9fa6f18..cf2a54cafd 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -43,14 +43,14 @@ popd function restore_metadata_backups() { pushd "$SCRIPT_DIR" - ./version_metadata.sh restore-backup + ./version-metadata.sh restore-backup mv Cargo.lock.bak Cargo.lock || true popd } trap 'restore_metadata_backups' EXIT cp Cargo.lock Cargo.lock.bak -./version_metadata.sh inject $PRODUCT_VERSION +./version-metadata.sh inject $PRODUCT_VERSION ./wireguard/build-wireguard-go.sh --android @@ -109,7 +109,7 @@ echo "Building Mullvad VPN $PRODUCT_VERSION" function restore_metadata_backups() { pushd "$SCRIPT_DIR" echo "Restoring version metadata files..." - ./version_metadata.sh restore-backup + ./version-metadata.sh restore-backup mv Cargo.lock.bak Cargo.lock || true popd } @@ -117,7 +117,7 @@ trap 'restore_metadata_backups' EXIT echo "Updating version in metadata files..." cp Cargo.lock Cargo.lock.bak -./version_metadata.sh inject $PRODUCT_VERSION +./version-metadata.sh inject $PRODUCT_VERSION ################################################################################ diff --git a/prepare_release.sh b/prepare_release.sh index 50319be67a..3cfc76a434 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -24,7 +24,7 @@ if [[ $(grep $PRODUCT_VERSION CHANGELOG.md) == "" ]]; then fi echo "Updating version in metadata files..." -./version_metadata.sh inject $PRODUCT_VERSION +./version-metadata.sh inject $PRODUCT_VERSION echo "Syncing Cargo.lock with new version numbers" source env.sh "" @@ -51,7 +51,7 @@ git commit -S -m "Updating version in package files" \ echo "Tagging current git commit with release tag $PRODUCT_VERSION..." git tag -s $PRODUCT_VERSION -m $PRODUCT_VERSION -./version_metadata.sh delete-backup +./version-metadata.sh delete-backup echo "=================================================" echo "| DONE preparing for a release! |" diff --git a/version-metadata.sh b/version-metadata.sh index f6803ea424..f6803ea424 100644..100755 --- a/version-metadata.sh +++ b/version-metadata.sh |