From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 28 Jun 2017 14:55:34 +0000 (+0200)
Subject: buildserver: support any recent NDK version, with stable filenames
X-Git-Tag: 0.8~19^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9a90a5071da893141968d5837c4cc213f5d9995b;p=fdroidserver.git

buildserver: support any recent NDK version, with stable filenames

Now that the download file name and type seems to have stabilized, I
think we no longer need to manually specify each new added release in
this script to unpack.

closes #331
---

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index de6943b4..5566305e 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -20,30 +20,13 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
-if [ ! -e $NDK_BASE/r11c ]; then
-    unzip /vagrant/cache/android-ndk-r11c-linux-x86_64.zip > /dev/null
-    mv android-ndk-r11c r11c
-fi
-
-if [ ! -e $NDK_BASE/r12b ]; then
-    unzip /vagrant/cache/android-ndk-r12b-linux-x86_64.zip > /dev/null
-    mv android-ndk-r12b r12b
-fi
-
-if [ ! -e $NDK_BASE/r13b ]; then
-    unzip /vagrant/cache/android-ndk-r13b-linux-x86_64.zip > /dev/null
-    mv android-ndk-r13b r13b
-fi
-
-if [ ! -e $NDK_BASE/r14b ]; then
-    unzip /vagrant/cache/android-ndk-r14b-linux-x86_64.zip > /dev/null
-    mv android-ndk-r14b r14b
-fi
-
-if [ ! -e $NDK_BASE/r15b ]; then
-    unzip /vagrant/cache/android-ndk-r15b-linux-x86_64.zip > /dev/null
-    mv android-ndk-r15b r15b
-fi
+for f in /vagrant/cache/android-ndk-r[1-9][0-9]*-linux-x86_64.zip; do
+    version=`echo $f |sed  's,.*\(r[1-9][0-9][a-z]\?\).*,\1,'`
+    if [ ! -e ${NDK_BASE}/${version} ]; then
+        unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
+        mv android-ndk-${version} ${version}
+    fi
+done
 
 chmod -R a+rX $NDK_BASE/
 find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x