From 20d54645f8972be253997422eb3df4f0903091a5 Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Fri, 5 Dec 2014 01:09:39 -0500
Subject: [PATCH] android_install takes care of everything

---
 .travis.yml        |  2 --
 android_install.sh | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 575b184..07a0b3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 language: java
-env:
-  - COMPONENTS="tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository,extra-android-support,extra-google-m2repository" ANDROID_HOME="./android-sdk-linux"
 
 before_install:
   - bash android_install.sh $COMPONENTS
diff --git a/android_install.sh b/android_install.sh
index a39adda..d4fe15c 100644
--- a/android_install.sh
+++ b/android_install.sh
@@ -1,14 +1,23 @@
 #!/bin/bash - 
 
+COMPONENTS="
+tools
+platform-tools
+build-tools-21.1.1
+android-21
+extra-android-m2repository
+extra-android-support
+extra-google-m2repository"
+
 wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
 tar xf android-sdk_r23.0.2-linux.tgz
 cd android-sdk-linux/
 export ANDROID_HOME=`pwd`
+ls android-sdk-linux/
 
-COMPONENT_ARRAY=$(echo $COMPONENTS | tr "," "\n")
-for COMP in $COMPONENT_ARRAY
+for COMP in ${COMPONENTS}
 do
-	echo "yes" | tools/android update sdk -u -a -t $COMP
+	echo "yes" | tools/android update sdk -u -a -t ${COMP}
 done
 
 cd -