From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 16 Oct 2013 16:23:27 +0000 (+0100)
Subject: Install filemagic on buildserver
X-Git-Tag: 0.1~348
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=255cd05c674579ce2be9d02f509cf902ab7d5bdd;p=fdroidserver.git

Install filemagic on buildserver
---

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 880ed939..1661a484 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -1,7 +1,7 @@
 
 user = node[:settings][:user]
 
-%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext}.each do |pkg|
+%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext python-pip}.each do |pkg|
   package pkg do
     action :install
   end
@@ -15,6 +15,12 @@ if node['kernel']['machine'] == "x86_64"
   end
 end
 
+execute "add-filemagic" do
+  user "root"
+  command "pip install filemagic"
+  not_if "pip list | grep filemagic"
+end
+
 script "install-gradle" do
   cwd "/tmp"
   interpreter "bash"