From: Holger Schemel <info@artsoft.org>
Date: Sat, 25 Sep 2021 10:38:13 +0000 (+0200)
Subject: added fallback site to script to download SDL libraries
X-Git-Tag: 4.3.0.0~31
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=86d87df2e5d8cd31e53fe0427f0e7e16146b5594

added fallback site to script to download SDL libraries
---

diff --git a/build-projects/android/build-scripts/create_sdl.sh b/build-projects/android/build-scripts/create_sdl.sh
index 901d150d..5ec679e1 100755
--- a/build-projects/android/build-scripts/create_sdl.sh
+++ b/build-projects/android/build-scripts/create_sdl.sh
@@ -5,7 +5,8 @@ JNI_DIR="app/jni"
 ANDROID_MK_SDL_IMAGE="$JNI_DIR/SDL2_image/Android.mk"
 ANDROID_MK_SDL_MIXER="$JNI_DIR/SDL2_mixer/Android.mk"
 
-SDL_BASE_URL="https://www.libsdl.org"
+SDL_BASE_URL_ORIGINAL="https://www.libsdl.org"
+SDL_BASE_URL_FALLBACK="https://www.artsoft.org"
 SDL_VERSIONS=`cat SDL_VERSIONS`
 
 for i in $SDL_VERSIONS; do
@@ -22,13 +23,21 @@ for i in $SDL_VERSIONS; do
 	SDL_RELEASE_DIR="projects/$SDL_SUBURL/release"
     fi
 
-    SDL_URL="$SDL_BASE_URL/$SDL_RELEASE_DIR/$i.tar.gz"
+    SDL_URL="$SDL_BASE_URL_ORIGINAL/$SDL_RELEASE_DIR/$i.tar.gz"
 
-    wget -O - "$SDL_URL" | (cd "$JNI_DIR" && tar xzf -)
+    wget --timeout=10 -O - "$SDL_URL" | (cd "$JNI_DIR" && tar xzf -)
 
     if [ "$?" != "0" ]; then
-	echo "ERROR: Installing '$i' failed!"
-	exit 10
+	echo "ERROR: Installing '$i' from main site failed -- trying fallback!"
+
+	SDL_URL="$SDL_BASE_URL_FALLBACK/RELEASES/sdl/$i.tar.gz"
+
+	wget --timeout=10 -O - "$SDL_URL" | (cd "$JNI_DIR" && tar xzf -)
+
+	if [ "$?" != "0" ]; then
+	    echo "ERROR: Installing '$i' from fallback site failed!"
+	    exit 10
+	fi
     fi
 
     mv "$JNI_DIR/$i" "$JNI_DIR/$SDL_SUBDIR"