From 283441398b7dfb416f474309cda1573f42dad0f7 Mon Sep 17 00:00:00 2001
From: Jeff Lindsay <progrium@gmail.com>
Date: Sun, 9 Jun 2013 23:26:56 -0700
Subject: [PATCH] install command, docs on upgrading/updating

---
 Makefile     |  8 ++++++++
 README.md    | 25 +++++++++++++++++++++----
 bootstrap.sh |  5 +----
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..5bb6160e1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+
+all: install
+
+install:
+	cp receiver /home/git/receiver
+	cp deploystep /home/git/deploystep
+	cp nginx-app-conf /home/git/nginx-app-conf
+	cp nginx-reloader.conf /etc/init/nginx-reloader.conf
\ No newline at end of file
diff --git a/README.md b/README.md
index 1e704436c..058fb584e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ That's it!
 
 ## Deploy an App
 
-Right now Buildstep supports the Node.js, Ruby and Java buildpacks. It's not hard to add more, [go add more](https://github.com/progrium/buildstep#adding-buildpacks)! Let's deploy
+Right now Buildstep supports the Node.js, Ruby, and Java buildpacks. It's not hard to add more, [go add more](https://github.com/progrium/buildstep#adding-buildpacks)! Let's deploy
 the Heroku Node.js sample app. All you have to do is add a remote to name the app. It's created on-the-fly.
 
     $ cd node-js-sample
@@ -38,9 +38,8 @@ the Heroku Node.js sample app. All you have to do is add a remote to name the ap
     Compressing objects: 100% (254/254), done.
     Writing objects: 100% (296/296), 193.59 KiB, done.
     Total 296 (delta 25), reused 276 (delta 13)
-    remote: ----> Receiving node-js-app ... 
     remote: -----> Building node-js-app ...
-    remote: Node.js app detected
+    remote:        Node.js app detected
     remote: -----> Resolving engine versions
     
     ... blah blah blah ...
@@ -53,7 +52,7 @@ You're done!
 ## Advanced installation (for development)
 
 The bootstrap script allows source URLs to be overridden to include customizations from your own 
-repositories. The GITRECEIVE_URL, BUILDSTEP_URL, BUILDSTEP_CONTAINER and DOKKU_REPO environment variables
+repositories. The GITRECEIVE_URL, BUILDSTEP_REPO and DOKKU_REPO environment variables
 may be set to override the defaults (see the bootstrap.sh script for how these apply):
 
 Example:
@@ -61,6 +60,24 @@ Example:
     $ wget j.mp/dokku-bootstrap
     $ chmod +x bootstrap.sh
     $ DOKKU_REPO=https://github.com/yourusername/dokku.git bootstrap.sh
+    
+## Upgrading
+
+Dokku is in active development. You can update the deployment step and the build step separately.
+To update the deploy step (this is updated less frequently):
+
+    $ cd ~/dokku
+    $ git pull origin master
+    $ make install
+    
+More frequently, the build step is updated. This is where the app "stack" lives and where buildpacks
+are supported. You can update this by running:
+
+    $ cd ~/buildstep
+    $ git pull origin master
+    $ make
+
+Nothing needs to be restarted. Changes will take effect on the next push / deployment.
 
 ## Components
 
diff --git a/bootstrap.sh b/bootstrap.sh
index b22148ce0..9f208f18f 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,10 +29,7 @@ make
 cd ~
 git clone ${DOKKU_REPO}
 cd dokku
-cp receiver /home/git/receiver
-cp deploystep /home/git/deploystep
-cp nginx-app-conf /home/git/nginx-app-conf
-cp nginx-reloader.conf /etc/init/nginx-reloader.conf
+make install
 
 stop nginx-reloader
 start nginx-reloader