From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 12 Jan 2014 10:57:23 +0000 (+0100)
Subject: Add build-tools to PATH
X-Git-Tag: 0.1~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ff01aa75cd17457c5713422b4bffa29af4598559;p=fdroidserver.git

Add build-tools to PATH
---

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index a21bdd30..19002064 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -29,26 +29,26 @@ execute "add-android-home" do
   not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
 end
 
-%w{19.0.1}.each do |ver|
-
-  script "add_build_tools_#{ver}" do
-    interpreter "bash"
-    user user
-    cwd "/tmp"
-    code "
-      if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
-        echo Installing from cache
-        mkdir #{sdk_loc}/build-tools
-        tar -C #{sdk_loc}/build-tools -z -x -f /vagrant/cache/build-tools/#{ver}.tar.gz
-      else
-        #{sdk_loc}/tools/android update sdk --no-ui -a -t build-tools-#{ver} <<X
+script "add_build_tools" do
+  interpreter "bash"
+  user user
+  ver = "19.0.1"
+  cwd "/tmp"
+  code "
+    if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
+      echo Installing from cache
+      mkdir #{sdk_loc}/build-tools
+      tar -C #{sdk_loc}/build-tools -z -x -f /vagrant/cache/build-tools/#{ver}.tar.gz
+    else
+      #{sdk_loc}/tools/android update sdk --no-ui -a -t build-tools-#{ver} <<X
 y
 
 X
-      fi
-    "
-    not_if "test -d #{sdk_loc}/build-tools/#{ver}"
-  end
+    fi
+	sed -i '/BTPATH/d' /home/#{user}/.bsenv
+	echo \"export PATH=\\$PATH:#{sdk_loc}/build-tools/#{ver} #BTPATH\" >> /home/#{user}/.bsenv
+  "
+  not_if "test -d #{sdk_loc}/build-tools/#{ver}"
 end
 
 # This is currently 19.0.1