summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-03-10 07:33:18 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-10 12:50:59 +0100
commit4262e648eb3adbd502ea57319d3fd27103a4f267 (patch)
treee1840efa6dbacc80d3affc39f3bba67cb4ed155f /android
parent5ee13ebd39c7c39c4086a2657b1aa170c10af1aa (diff)
downloadrockbox-4262e648eb3adbd502ea57319d3fd27103a4f267.tar.gz
rockbox-4262e648eb3adbd502ea57319d3fd27103a4f267.tar.bz2
rockbox-4262e648eb3adbd502ea57319d3fd27103a4f267.zip
android: Fix installToolchain.sh script.
Change-Id: I6c22043956cea5c5aec3e411045082e1a9b69442
Diffstat (limited to 'android')
-rwxr-xr-xandroid/installToolchain.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/android/installToolchain.sh b/android/installToolchain.sh
index 05d3d82ae8..3cdf27b9cd 100755
--- a/android/installToolchain.sh
+++ b/android/installToolchain.sh
@@ -12,7 +12,7 @@ NDK_DOWNLOAD_URL="http://developer.android.com/sdk/ndk/index.html"
find_url() {
base_url="$1"
os="$2"
- wget -q -O - $base_url | grep dl.google.com | sed 's/.*"\(http:\/\/.*\)".*/\1/' | grep $os | grep -v .exe # Windows hack
+ wget -q -O - $base_url | grep dl.google.com | sed 's/.*"\(http:\/\/.*\)".*/\1/' | grep $os | grep -v bundle | grep -v .exe # Windows hack
}
OS=`uname`
@@ -52,14 +52,14 @@ download_and_extract() {
fi
echo " * Extracting $name..."
- case ${local_file#*.} in
- zip)
+ case ${local_file} in
+ *.zip)
unzip -qo -d "$prefix" "$local_file"
;;
- tgz|tar.gz)
- (cd $prefix; tar -xf "$local_file")
+ *.tgz|*.tar.gz)
+ (cd $prefix; tar -xzf "$local_file")
;;
- tar.bz2)
+ *.tar.bz2)
(cd $prefix; tar -xjf "$local_file")
;;
*)