chiark / gitweb /
makebs: work around build-tools 24.0.1 version bug
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 2 Aug 2016 16:08:48 +0000 (18:08 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 2 Aug 2016 16:08:48 +0000 (18:08 +0200)
The zip contains 24.0.0 as the version, which means our magic was
installing 24.0.0 twice and skipping 24.0.1.

buildserver/provision-android-sdk

index 31bb95b2f873c5c798386a803876476de6bacee3..57eacdc46ca4f73c2bace349691450eb3ebc6539 100644 (file)
@@ -41,6 +41,10 @@ done
 # install all cached build-tools
 for f in `ls -1 build-tools*.zip`; do
     ver=`unzip -c $f "*/source.properties" | sed -n 's,^Pkg.Revision=,,p'`
+    if [[ $ver == 24.0.0 ]] && [[ $f =~ .*r24\.0\.1.* ]]; then
+        # 24.0.1 has the wrong revision in the zip
+        ver=24.0.1
+    fi
     cached=,build-tools-${ver}${cached}
 done