From c3956065f490912c5f5e0aa6b8e28ad93c3be9ab Mon Sep 17 00:00:00 2001
From: Rafael Martins <rmmartins@gmail.com>
Date: Wed, 14 Mar 2012 10:08:59 -0300
Subject: [PATCH] Remove unnecessary calls (solr:download is run by solr:start)

---
 HACKING                | 3 +--
 INSTALL                | 3 ---
 lib/tasks/package.rake | 4 +++-
 script/development     | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/HACKING b/HACKING
index bdbf8a0..131f747 100644
--- a/HACKING
+++ b/HACKING
@@ -40,8 +40,7 @@ commands and make sure you understand what you are doing):
  cp config/database.yml.sqlite3 config/database.yml
  # create tmp directory if it doesn't exist
  mkdir tmp
- # download and start Solr
- rake solr:download
+ # start Solr
  rake solr:start
  # create the development database
  rake db:schema:load
diff --git a/INSTALL b/INSTALL
index 053abc8..9b822f5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -117,9 +117,6 @@ $ cd current
 
 Copy config/solr.yml.dist to config/solr.yml. You will
 probably not need to customize this configuration, but have a look at it.
-Then you'll need to download Solr into noosfero:
-
-$ rake solr:download
 
 Create the mongrel configuration file:
 
diff --git a/lib/tasks/package.rake b/lib/tasks/package.rake
index c263c54..1ef323e 100644
--- a/lib/tasks/package.rake
+++ b/lib/tasks/package.rake
@@ -8,18 +8,20 @@ task :package => 'package:clobber' do
     puts "** The `package` task only works from within #{Noosfero::PROJECT}'s git repository."
     fail
   end
+
   begin
     sh 'test -f vendor/plugins/acts_as_solr_reloaded/solr/start.jar'
   rescue
     puts "** The `package` task needs Solr installed within #{Noosfero::PROJECT}. Run 'rake solr:download'."
     fail
   end
+
   release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}"
   target = "pkg/#{release}"
   mkdir_p target
   sh "git archive HEAD | (cd #{target} && tar x)"
 
-  #solr inclusion
+  # solr inclusion
   cp_r "vendor/plugins/acts_as_solr_reloaded/solr", "#{target}/vendor/plugins/acts_as_solr_reloaded", :verbose => true
   rm_r "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"
   mkdir_p "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"
diff --git a/script/development b/script/development
index a81c5f2..fc10d85 100755
--- a/script/development
+++ b/script/development
@@ -6,12 +6,12 @@ stop() {
   ./script/delayed_job stop
   ./script/feed-updater stop
   rake -s solr:stop
+  exit
 }
 
 start() {
   ./script/feed-updater start
   ./script/delayed_job start
-  rake -s solr:download
   rake -s solr:start
   trap stop INT TERM
   ./script/server $@
--
libgit2 0.21.2