From f5a0c2a7d90b99805e8c8aa5f1c7963c8720f5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 27 Nov 2018 13:13:21 +0100
Subject: [PATCH] download from DigitalOcean first since it's faster
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index beb727d39d..d7fdbe0d0f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 help: ##@other Show this help
 	@perl -e '$(HELP_FUN)' $(MAKEFILE_LIST)
 
-DO_SPACE_URL = https://status-go.ams3.digitaloceanspaces.com/
+DO_SPACE_URL = https://status-go.ams3.digitaloceanspaces.com
 GITHUB_URL = https://github.com/status-im/status-go/releases/download
 RCTSTATUS_DIR = modules/react-native-status/ios/RCTStatus
 ANDROID_LIBS_DIR = android/app/libs
@@ -49,30 +49,30 @@ prepare-desktop: ##@prepare Install desktop platform dependencies and prepare wo
 
 $(STATUS_GO_IOS_ARCH):
 	curl --fail --silent --location \
-		"$(GITHUB_URL)/$(STATUS_GO_VER)/status-go-ios.zip" \
+		"${DO_SPACE_URL}/status-go-ios-$(STATUS_GO_VER).zip" \
 		--output "$(STATUS_GO_IOS_ARCH)"; \
 	if [ $$? -ne 0 ]; then \
-		echo "Failed to download from GitHub, checking DigitalOcean Bucket..."; \
+		echo "Failed to download from DigitalOcean Bucket, checking GitHub..."; \
 		curl --fail --silent --location \
-			"${DO_SPACE_URL}/status-go-ios-$(STATUS_GO_VER).zip" \
+			"$(GITHUB_URL)/$(STATUS_GO_VER)/status-go-ios.zip" \
 			--output "$(STATUS_GO_IOS_ARCH)"; \
 		if [ $$? -ne 0 ]; then \
-			echo "Failed to download from DigitalOcean Spaces!"; \
+			echo "Failed to download from GitHub!"; \
 		fi \
 	fi
 
 $(STATUS_GO_DRO_ARCH):
 	mkdir -p $(ANDROID_LIBS_DIR)
 	curl --fail --silent --location \
-		"$(GITHUB_URL)/$(STATUS_GO_VER)/status-go-android.aar" \
+		"${DO_SPACE_URL}/status-go-android-$(STATUS_GO_VER).aar" \
 		--output "$(STATUS_GO_DRO_ARCH)"; \
 	if [ $$? -ne 0 ]; then \
-		echo "Failed to download from GitHub, checking DigitalOcean Bucket..."; \
+		echo "Failed to download from DigitalOcean Bucket, checking GitHub..."; \
 		curl --fail --silent --location \
-			"${DO_SPACE_URL}/status-go-android-$(STATUS_GO_VER).aar" \
+			"$(GITHUB_URL)/$(STATUS_GO_VER)/status-go-android.aar" \
 			--output "$(STATUS_GO_DRO_ARCH)"; \
 		if [ $$? -ne 0 ]; then \
-			echo "Failed to download from DigitalOcean Spaces!"; \
+			echo "Failed to download from GitHub!"; \
 		fi \
 	fi