diff options
| author | Albin <albin@mullvad.net> | 2023-10-18 13:21:31 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-10-19 20:53:56 +0200 |
| commit | 581943e9e40fa7f60e2107a4144a1f63cf266d89 (patch) | |
| tree | 9c90bff6bcb57b1457f0b20de7d34905deff466f | |
| parent | fd722d90b520ce8e87ce4f4366297de10b2b5ffe (diff) | |
| download | mullvadvpn-581943e9e40fa7f60e2107a4144a1f63cf266d89.tar.xz mullvadvpn-581943e9e40fa7f60e2107a4144a1f63cf266d89.zip | |
Fix tag insertion in flavor builds
This fix ensures that the tag is inserted
in the correct place of flavored builds.
Previously:
MullvadVPN-<version>.play+<tag>.aab
Fixed:
MullvadVPN-<version>+<tag>.play.aab
| -rwxr-xr-x | ci/buildserver-build-android.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ci/buildserver-build-android.sh b/ci/buildserver-build-android.sh index 25713f63da..f9321fe83d 100755 --- a/ci/buildserver-build-android.sh +++ b/ci/buildserver-build-android.sh @@ -103,13 +103,7 @@ function build_ref { # Pipes all matching names and their new name to mv pushd "$artifact_dir" for original_file in MullvadVPN-*-dev-*{.apk,.aab}; do - # Fix to make sure the sed command below result in the expected file name. - if [[ $original_file == *.play.aab ]]; then - bundle_extension="\.play\.aab" - else - bundle_extension="\.aab" - fi - new_file=$(echo "$original_file" | sed -nE "s/^(MullvadVPN-.*-dev-.*)(\.apk|$bundle_extension)$/\1$version_suffix\2/p") + new_file=$(echo "$original_file" | sed -nE "s/^(MullvadVPN-$version)(.*\.apk|.*\.aab)$/\1$version_suffix\2/p") mv "$original_file" "$new_file" done popd |