From 06f9a42601b40da68d271a0a84171bc459a9945a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jan 2014 16:27:34 +0100
Subject: [PATCH] Move gradle to its own cookbook

---
 .../fdroidbuild-general/recipes/default.rb    | 19 ----------------
 .../cookbooks/gradle/recipes/default.rb       | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 buildserver/cookbooks/gradle/recipes/default.rb

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 8587f3d9..95a86dcd 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -19,25 +19,6 @@ if node['kernel']['machine'] == "x86_64"
   end
 end
 
-script "add-gradle-dir" do
-  cwd "/tmp"
-  interpreter "bash"
-  code "mkdir -p /opt/gradle"
-  not_if "test -d /opt/gradle"
-end
-
-%w{1.4 1.6 1.7 1.8 1.9}.each do |ver|
-  script "install-gradle-#{ver}" do
-    cwd "/tmp"
-    interpreter "bash"
-    code "
-      unzip /vagrant/cache/gradle-#{ver}-bin.zip
-      mv gradle-#{ver} /opt/gradle/#{ver}
-    "
-    not_if "test -d /opt/gradle/#{ver}"
-  end
-end
-
 execute "add-bsenv" do
   user user
   command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"
diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
new file mode 100644
index 00000000..60a00750
--- /dev/null
+++ b/buildserver/cookbooks/gradle/recipes/default.rb
@@ -0,0 +1,22 @@
+
+user = node[:settings][:user]
+
+script "add-gradle-dir" do
+  cwd "/tmp"
+  interpreter "bash"
+  code "mkdir -p /opt/gradle"
+  not_if "test -d /opt/gradle"
+end
+
+%w{1.4 1.6 1.7 1.8 1.9 1.10}.each do |ver|
+  script "install-gradle-#{ver}" do
+    cwd "/tmp"
+    interpreter "bash"
+    code "
+      unzip /vagrant/cache/gradle-#{ver}-bin.zip
+      mv gradle-#{ver} /opt/gradle/#{ver}
+    "
+    not_if "test -d /opt/gradle/#{ver}"
+  end
+end
+