From 3d37056faa3a2379377459db9286f107aeca3e1f Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 19 Jul 2012 18:07:27 -0300 Subject: [PATCH] Small enhancement in solr:download --- vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake b/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake index 091695e..7174867 100644 --- a/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake +++ b/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake @@ -18,13 +18,14 @@ namespace :solr do task :download do abort 'Solr already downloaded.' if solr_downloaded? - Dir.chdir '/tmp' do + tmpdir = [ '/var/tmp', '/tmp' ].find { |d| File.exists?(d) } + Dir.chdir tmpdir do sh "wget -c #{SOLR_URL}" - sh "echo \"#{SOLR_MD5SUM} /tmp/#{SOLR_FILENAME}\" | md5sum -c -" do |ok, res| + sh "echo \"#{SOLR_MD5SUM} #{SOLR_FILENAME}\" | md5sum -c -" do |ok, res| abort "MD5SUM do not match" if !ok - sh "tar xzf apache-solr-#{SOLR_VERSION}.tgz" + sh "tar xzf #{SOLR_FILENAME}" cd "apache-solr-#{SOLR_VERSION}/example" cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], "#{PLUGIN_ROOT}/solr", :verbose => true -- libgit2 0.21.2