Remove unnecessary calls (solr:download is run by solr:start)

Rafael Martins
1 parent d8111782
Showing 4 changed files with 5 additions and 7 deletions Show diff stats
HACKING
INSTALL
lib/tasks/package.rake
script/development
@@ -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
@@ -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:
@@ -8,18 +8,20 @@ task :package =&gt; &#39;package:clobber&#39; 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"
@@ -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 $@
	@@ -117,9 +117,6 @@ $ cd current		@@ -117,9 +117,6 @@ $ cd current
117		117
118	Copy config/solr.yml.dist to config/solr.yml. You will	118	Copy config/solr.yml.dist to config/solr.yml. You will
119	probably not need to customize this configuration, but have a look at it.	119	probably not need to customize this configuration, but have a look at it.
120	-Then you'll need to download Solr into noosfero:
121	-
122	-$ rake solr:download
123		120
124	Create the mongrel configuration file:	121	Create the mongrel configuration file:
125		122