diff options
| author | Albin <albin@mullvad.net> | 2025-02-19 13:56:55 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-02-19 13:56:57 +0100 |
| commit | e1e211b69a1d671ade6d0ebae271bad25a578637 (patch) | |
| tree | 6c01fad081d73f2bdb4dc2bfb63406f819bcc457 /android | |
| parent | a79ed4ecabed1afc1b99b57197c56910ae2576ad (diff) | |
| download | mullvadvpn-e1e211b69a1d671ade6d0ebae271bad25a578637.tar.xz mullvadvpn-e1e211b69a1d671ade6d0ebae271bad25a578637.zip | |
Fix local.properties check
Ensures that the local.properties check in the build script
better handles cases when the local.properties file doesn't
exist.
Diffstat (limited to 'android')
| -rwxr-xr-x | android/build.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/build.sh b/android/build.sh index d29381afea..ab1860fe4a 100755 --- a/android/build.sh +++ b/android/build.sh @@ -17,6 +17,7 @@ BUILD_BUNDLE="no" BUNDLE_TASKS=(createPlayProdReleaseDistBundle) RUN_PLAY_PUBLISH_TASKS="no" PLAY_PUBLISH_TASKS=() +LOCAL_PROPERTIES_FILE="local.properties" while [ -n "${1:-""}" ]; do if [[ "${1:-""}" == "--dev-build" ]]; then @@ -90,8 +91,8 @@ echo "" echo " Build checksums:" md5sum ../dist/MullvadVPN-"$PRODUCT_VERSION"* | sed 's/^/ /' echo "" -if grep -q "^CARGO_TARGETS=" local.properties; then - echo " CARGO_TARGETS is set in local.properties, build may not be reproducible!" +if [[ -f "$LOCAL_PROPERTIES_FILE" ]] && grep -q "^CARGO_TARGETS=" "$LOCAL_PROPERTIES_FILE"; then + echo " CARGO_TARGETS is set in $LOCAL_PROPERTIES_FILE, build may not be reproducible!" fi echo "" echo "**********************************" |