<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>script/install_merb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,48 +1,19 @@
 = Welcome to Blerb!
 
 == Installation
-  * Install merb-core, merb-more and merb-plugins from wycats repo on github
-  
-  * Install merb-core
-    * git clone git://github.com/wycats/merb-core.git
-    * cd merb-core
-    * rake install
-    * sudo cp bin/merb /usr/bin/merb
-    * or use one-liner: git clone git://github.com/wycats/merb-core.git &amp;&amp; cd merb-core &amp;&amp; rake install &amp;&amp; sudo cp bin/merb /usr/bin/merb
-    
-  * Install merb-more
-    * git clone git://github.com/wycats/merb-more.git
-    * cd merb-more
-    * cd merb-action-args
-    * rake install
-    * cd ../merb-assets
-    * rake install
-    * cd ../merb-test
-    * rake install
-    * cd ../merb-mailer
-    * rake install
-    * or use one-liner: git clone git://github.com/wycats/merb-more.git &amp;&amp; cd merb-more/merb-action-args &amp;&amp; rake install &amp;&amp; cd ../merb-assets &amp;&amp; rake install &amp;&amp; cd ../merb-test &amp;&amp; rake install &amp;&amp; cd ../merb-mailer &amp;&amp; rake install
-    
-  * Install merb-plugins
-    * git clone git://github.com/wycats/merb-plugins.git
-    * cd merb-plugins
-    * cd merb_datamapper
-    * rake install
-    * cd ../merb_helpers
-    * rake install
-    * cd ../merb_rspec
-    * rake install
-    * or use one-liner: git clone git://github.com/wycats/merb-plugins.git &amp;&amp; cd merb-plugins/merb_datamapper &amp;&amp; rake install &amp;&amp; cd ../merb_helpers &amp;&amp; rake install &amp;&amp; cd ../merb_rspec &amp;&amp; rake install
-    
+  * from your working directory, say ~/code/, clone the blerb repository:
   * git clone git://github.com/hornbeck/blerb-core.git - anon checkout
   * git clone git@github.com:hornbeck/blerb-core.git   - commit access
   * cd blerb-core
+  * use script/install to update or install merb-* in the parent directory (e.g. ~/code/merb-core/):
+  * script/install_merb
   * cp config/database.yml.sample config/database.yml
   * fill in the correct database credentials
   * cp config/settings.sample.yml config/settings.yml
   * fill in the correct blog settings
   * rake dm:auto_migrate
-  * script/blerb
+  * to start a webserver, run the merb command:
+  * merb
 
 Blerb should now be running on port 4000, so open up your browser and visit localhost:4000!
 </diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -3,18 +3,15 @@ Gem.clear_paths
 Gem.path.unshift(File.join(File.dirname(__FILE__), &quot;gems&quot;))
 
 require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'fileutils'
 require 'merb-core'
-require 'rubigen'
 
 $RAKE_ENV = true
 
-Merb.start :environment =&gt; (ENV['MERB_ENV'] || 'development'),
-           :adapter     =&gt; 'runner',
-           :merb_root  =&gt; File.dirname(__FILE__)
+init_file = File.join(File.dirname(__FILE__) / &quot;config&quot; / &quot;init&quot;)
+
+Merb.load_dependencies(init_file)
            
 include FileUtils
 # # # Get Merb plugins and dependencies</diff>
      <filename>Rakefile</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>23ff2003e952e2dac1d60c1cc43211524b7aef92</id>
    </parent>
  </parents>
  <author>
    <name>Ben Burkert</name>
    <email>ben@benburkert.com</email>
  </author>
  <url>http://github.com/hornbeck/blerb-core/commit/0de64156f0af73aabd4e8650a7df9005e4659d2e</url>
  <id>0de64156f0af73aabd4e8650a7df9005e4659d2e</id>
  <committed-date>2008-02-23T12:54:33-08:00</committed-date>
  <authored-date>2008-02-23T12:54:33-08:00</authored-date>
  <message>added script/install_merb, updated Rakefile and README</message>
  <tree>f6628974f52a76960c02dc3e14f404e1fb54f737</tree>
  <committer>
    <name>Ben Burkert</name>
    <email>ben@benburkert.com</email>
  </committer>
</commit>
