lots of cleanup

bootstrap.sh

@@ -1,43 +1,24 @@
 # Repository locations - set environment variables to override defaults
 #  e.g. DOKKU_REPO=https://github.com/yourusername/dokku.git bootstrap.sh
 GITRECEIVE_URL=${GITRECEIVE_URL:-"https://raw.github.com/progrium/gitreceive/master/gitreceive"}
-BUILDSTEP_REPO=${BUILDSTEP_REPO:-"https://github.com/progrium/buildstep.git"}
 DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
 
-# Docker and base dependencies
-apt-get install -y linux-image-extra-`uname -r`
-apt-get install -y software-properties-common
+apt-get install -y linux-image-extra-`uname -r` software-properties-common
 add-apt-repository -y ppa:dotcloud/lxc-docker
-apt-get update
-apt-get install -y lxc-docker
-apt-get install -y git ruby nginx make
+apt-get update && apt-get install -y lxc-docker git ruby nginx make
 
-# gitreceive
-cd /usr/local/bin
-wget ${GITRECEIVE_URL}
-chmod +x gitreceive
+wget -o /usr/local/bin/gitreceive ${GITRECEIVE_URL}
+chmod +x /usr/local/bin/gitreceive
 gitreceive init
 
-# buildstep
-cd ~
-git clone ${BUILDSTEP_REPO}
-cd buildstep
-cp buildstep /home/git/buildstep
-make
+cd ~ && git clone ${DOKKU_REPO}
+cd dokku && make install
+cd buildstep && make build
 
-# dokku (this!)
-cd ~
-git clone ${DOKKU_REPO}
-cd dokku
-make install
-
-stop nginx-reloader
 start nginx-reloader
-
-# configure and start nginx
-echo "include /home/git/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf
 /etc/init.d/nginx start
 
+echo "include /home/git/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf
 echo $HOSTNAME > /home/git/DOMAIN
 
 echo