Download as
Browse Code »

Commit 3d37056faa3a2379377459db9286f107aeca3e1f

Authored by Antonio Terceiro
1 parent 334e5511
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Small enhancement in solr:download 

I am used to run `git clean -dxf` to make sure Noosfero can bootstrap
itself in development mode with ./script/quick-start. If the solr
tarball is downloaded to /tmp, every time I reboot I have to download
everything once again. Contrary to /tmp/, /var/tmp/ is *not* wiped at
boot time.
Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
  Diff comments   View file @3d37056
@@ -18,13 +18,14 @@ namespace :solr do @@ -18,13 +18,14 @@ namespace :solr do
18 task :download do 18 task :download do
19 abort 'Solr already downloaded.' if solr_downloaded? 19 abort 'Solr already downloaded.' if solr_downloaded?
20 20
21 - Dir.chdir '/tmp' do 21 + tmpdir = [ '/var/tmp', '/tmp' ].find { |d| File.exists?(d) }
  22 + Dir.chdir tmpdir do
22 sh "wget -c #{SOLR_URL}" 23 sh "wget -c #{SOLR_URL}"
23 24
24 - sh "echo \"#{SOLR_MD5SUM} /tmp/#{SOLR_FILENAME}\" | md5sum -c -" do |ok, res| 25 + sh "echo \"#{SOLR_MD5SUM} #{SOLR_FILENAME}\" | md5sum -c -" do |ok, res|
25 abort "MD5SUM do not match" if !ok 26 abort "MD5SUM do not match" if !ok
26 27
27 - sh "tar xzf apache-solr-#{SOLR_VERSION}.tgz" 28 + sh "tar xzf #{SOLR_FILENAME}"
28 cd "apache-solr-#{SOLR_VERSION}/example" 29 cd "apache-solr-#{SOLR_VERSION}/example"
29 30
30 cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], "#{PLUGIN_ROOT}/solr", :verbose => true 31 cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], "#{PLUGIN_ROOT}/solr", :verbose => true