<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>data/db/.placeholder</filename>
    </added>
    <added>
      <filename>install.php</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -3,6 +3,21 @@ features of the Dojo/Zend Framework integration.
 
 INSTALLATION
 =======================================================================
+This application requires that you either have Zend Framework on your
+include_path, or that you will be symlinking your Zend Framework library
+into the library directory. If you do not yet have Zend Framework, you
+can get it from one of the following sources:
+
+  * Official Release:
+    http://framework.zend.com/dowload/latest
+
+  * Subversion; use either the current trunk or the 1.7 release branch:
+    svn co http://framework.zend.com/svn/framework/standard/trunk/library/Zend
+
+    svn co http://framework.zend.com/svn/framework/standard/branches/release-1.7/library/Zend
+
+Install Zend Framework locally, and the follow these steps:
+
 1. Untar the archive using:
 
     tar xzf &lt;packagefile&gt;
@@ -14,36 +29,18 @@ INSTALLATION
 
    (Assuming /var/www contains directories for your vhosts.)
 
-3. Symlink or install the library/Zend/ directory of your Zend Framework
-   installation (1.6.0RC1 or later, or current trunk) to library/Zend/
-   -- this is done to keep the tarball size down.
-
-   Alternately, you can grab current trunk or the 1.7 release branch
-   from SVN using:
-
-     svn co http://framework.zend.com/svn/framework/standard/trunk/library/Zend
-
-     svn co http://framework.zend.com/svn/framework/standard/branches/release-1.7/library/Zend
-
-4. If you are on Windows, rename the public/js-src directory to
-   public/js; on *nix, verify that public/js is a symlink to
-   public/js-src.
-
-5. Make the directory application/data and all files within it world
-   writeable; this can be accomplished on *nix systems using:
-
-    chmod -R a+rwX &lt;packagedir&gt;/application/data
+3. Run the install script
+   The application now comes with an install script, that creates the
+   necessary symlinks, initializes the development database, and sets
+   appropriate permissions. Simply run it using php:
 
-6. Make the directory public/api/spindle/paste/content world writeable; this can
-   be accomplished on *nix systems using:
+     php install.php path/to/ZendFramework/library/Zend
 
-    chmod a+rwX &lt;packagedir&gt;/public/api/spindle/paste/content
+   You can get full usage by passing the -h, --help, or -? options:
 
-   This will only affect you when you set the application environment to
-   &quot;production&quot;, at which time artifacts will be written to the
-   directory.
+     php install.php -h
 
-7. Create a vhost that points its DocumentRoot to the public
+3. Create a vhost that points its DocumentRoot to the public
    subdirectory. As an example:
 
     &lt;VirtualHost *&gt;
@@ -65,7 +62,7 @@ INSTALLATION
 
     127.0.1.1 paste.local
 
-8. Finally, simply fire your browser to:
+4. Finally, simply fire your browser to:
 
     http://paste.local/
 </diff>
      <filename>README.txt</filename>
    </modified>
    <modified>
      <diff>@@ -3,10 +3,3 @@
   - JS that updates main content pane either 
     - from HREF
     - creating basic structure
-- Create an install script
-  - should set appropriate permissions
-    - data directory (world writeable)
-    - api/spindle/paste/content directory (world writeable)
-  - should optionally allow specifying directory containing ZF to symlink in
-  - should symlink js-src js
-  - should create dev database (if ZF is detected)</diff>
      <filename>TODO</filename>
    </modified>
    <modified>
      <diff>@@ -3,9 +3,10 @@
  * Script for creating and loading test database
  */
 
-if (!defined('APPLICATION_PATH')) {
-    define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application/'));
-}
+defined('APPLICATION_PATH') 
+    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application/'));
+defined('APPLICATION_ENV') 
+    || define('APPLICATION_ENV', 'testing');
 
 if (!class_exists('Zend_Registry', false) || !Zend_Registry::isRegistered('config')) {
 
@@ -19,7 +20,7 @@ if (!class_exists('Zend_Registry', false) || !Zend_Registry::isRegistered('confi
         Zend_Loader::registerAutoload();
     }
 
-    $config = new Zend_Config_Ini(APPLICATION_PATH . '/config/site.ini', 'testing');
+    $config = new Zend_Config_Ini(APPLICATION_PATH . '/config/site.ini', APPLICATION_ENV);
     Zend_Registry::set('config', $config);
     unset($base, $path, $config);
 }</diff>
      <filename>scripts/loadTestDb.php</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>cee9905e71076f2866998eb0ecbb6f1fbbe6f0cc</id>
    </parent>
  </parents>
  <author>
    <name>Matthew Weier O'Phinney</name>
    <email>matthew@weierophinney.net</email>
  </author>
  <url>http://github.com/weierophinney/pastebin/commit/d911a0f67bdf94e1c3ead3c2f92a89da4e508fc6</url>
  <id>d911a0f67bdf94e1c3ead3c2f92a89da4e508fc6</id>
  <committed-date>2008-12-05T13:41:31-08:00</committed-date>
  <authored-date>2008-12-05T13:11:08-08:00</authored-date>
  <message>Created install script
Updated loadTestDb.php to use APPLICATION_ENV constant
Added data/db/ directory
Updated instructions in README.txt</message>
  <tree>36355869dd72ad744fb54251e1958497f480eee2</tree>
  <committer>
    <name>Matthew Weier O'Phinney</name>
    <email>matthew@weierophinney.net</email>
  </committer>
</commit>
