Download as
Browse Code »

Commit c6f24fe8fffbd1d5d9b0badf4100de5c3b83f9d0

Authored by Rafael Martins
1 parent e176536e
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Fix for rake task 'solr:download' 

* Problem when joining Rails.root + "/path", had to remove the first /
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
  Diff comments   View file @c6f24fe
@@ -2,22 +2,22 @@ namespace :solr do @@ -2,22 +2,22 @@ namespace :solr do
2 2
3 desc 'Download and install Solr+Jetty 3.3.0.' 3 desc 'Download and install Solr+Jetty 3.3.0.'
4 task :download do 4 task :download do
5 - if (File.exists?(Rails.root + '/vendor/plugins/acts_as_solr_reloaded/solr/start.jar')) 5 + if (File.exists?(Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/start.jar'))
6 puts 'Solr already downloaded.' 6 puts 'Solr already downloaded.'
7 else 7 else
8 cd '/tmp' 8 cd '/tmp'
9 sh 'wget -c http://ftp.unicamp.br/pub/apache/lucene/solr/3.3.0/apache-solr-3.3.0.tgz' 9 sh 'wget -c http://ftp.unicamp.br/pub/apache/lucene/solr/3.3.0/apache-solr-3.3.0.tgz'
10 sh 'tar xzf apache-solr-3.3.0.tgz' 10 sh 'tar xzf apache-solr-3.3.0.tgz'
11 cd 'apache-solr-3.3.0/example' 11 cd 'apache-solr-3.3.0/example'
12 - cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], Rails.root + '/vendor/plugins/acts_as_solr_reloaded/solr', :verbose => true 12 + cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr', :verbose => true
13 cd 'solr' 13 cd 'solr'
14 - cp_r ['README.txt', 'bin', 'solr.xml'], Rails.root + '/vendor/plugins/acts_as_solr_reloaded/solr/solr', :verbose => true 14 + cp_r ['README.txt', 'bin', 'solr.xml'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/solr', :verbose => true
15 end 15 end
16 end 16 end
17 17
18 desc 'Remove Solr instalation from the tree.' 18 desc 'Remove Solr instalation from the tree.'
19 task :remove do 19 task :remove do
20 - solr_root = Rails.root + '/vendor/plugins/acts_as_solr_reloaded/solr/' 20 + solr_root = Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/'
21 rm_r ['README.txt', 'bin', 'solr.xml'].map{ |i| File.join(solr_root, 'solr', i) }, :verbose => true, :force => true 21 rm_r ['README.txt', 'bin', 'solr.xml'].map{ |i| File.join(solr_root, 'solr', i) }, :verbose => true, :force => true
22 rm_r ['LICENSE.txt', 'NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'].map{ |i| File.join(solr_root, i) }, :verbose => true, :force => true 22 rm_r ['LICENSE.txt', 'NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'].map{ |i| File.join(solr_root, i) }, :verbose => true, :force => true
23 end 23 end