diff options
| -rw-r--r-- | ios/README.md | 4 | ||||
| -rwxr-xr-x | ios/relays-prebuild.sh | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ios/README.md b/ios/README.md index 73f2721436..80e4e580b2 100644 --- a/ios/README.md +++ b/ios/README.md @@ -100,4 +100,6 @@ ios/convert-assets.rb --additional-assets ## Cached relays -The script `relays-prebuild.sh` runs on each Xcode build and updates the cached relay list whenever there *IS NO* relay file. To get a fresh relay file on demand, simply remove `MullvadREST/Assets/relays.json` and build the Xcode project. +The script `relays-prebuild.sh` runs on each Xcode build and will download and cache a list of relays if it is not already present for a given configuration. +The cached list for a given configuration will always override the current relays file. +To get a fresh relay file on demand, issue a `clean` command to Xcode and re-build the project. diff --git a/ios/relays-prebuild.sh b/ios/relays-prebuild.sh index 072d81d260..b583611ca3 100755 --- a/ios/relays-prebuild.sh +++ b/ios/relays-prebuild.sh @@ -7,13 +7,27 @@ fi RELAYS_FILE="$PROJECT_DIR/MullvadREST/Assets/relays.json" +# Do not download the file for release builds, a different script will take care of that. +if [ "$CONFIGURATION" == "Release" ]; then + # Fail loudly if the required file is not already present. + if [ ! -f "$RELAYS_FILE" ]; then + echo "No file found at $RELAYS_FILE" + exit 1 + fi + return 0 +fi + +BACKUP_FILE="$CONFIGURATION_TEMP_DIR/relays.json" + if [ "$CONFIGURATION" == "Staging" ]; then API_ENDPOINT="api.stagemole.eu" else API_ENDPOINT="api.mullvad.net" fi -if [ ! -f "$RELAYS_FILE" ]; then - echo "Download relays file" - curl https://"$API_ENDPOINT"/app/v1/relays -s -o "$RELAYS_FILE" +if [ ! -f "$BACKUP_FILE" ]; then + echo "Downloading relays file for $CONFIGURATION" + curl https://"$API_ENDPOINT"/app/v1/relays -s -o "$BACKUP_FILE" fi + +cp "$BACKUP_FILE" "$RELAYS_FILE" |