moving install hook trigger into make install

Makefile

@@ -10,6 +10,7 @@ install: gitreceive sshcommand pluginhook
 	cp nginx-app-conf /home/git/nginx-app-conf
 	mkdir -p /var/lib/dokku/plugins
 	cp -r plugins/* /var/lib/dokku/plugins
+	PLUGIN_PATH=/var/lib/dokku/plugins pluginhook install
 
 gitreceive:
 	wget -qO /usr/local/bin/gitreceive ${GITRECEIVE_URL}
@@ -26,4 +27,4 @@ pluginhook:
 	cd /tmp && dpkg -i pluginhook_0.1.0_amd64.deb
 
 count:
-	cat receiver dokku bootstrap.sh nginx-app-conf nginx-reloader.conf | wc -l
+	cat receiver dokku bootstrap.sh nginx-app-conf | wc -l

bootstrap.sh

@@ -15,9 +15,6 @@ cd dokku && make install
 
 curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep
 
-PLUGIN_PATH=/var/lib/dokku/plugins
-pluginhook install
-
 echo
 echo "Be sure to upload a public key for your user:"
 echo "  cat ~/.ssh/id_rsa.pub | ssh root@$HOSTNAME \"gitreceive upload-key progrium\""

plugins/00_dokku-standard/install

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-sed -i 's/docker -d/docker -d -r=true/' /etc/init/docker.conf
+[[ $(cat /etc/init/docker.conf | grep r=true) ]] || sed -i 's/docker -d/docker -d -r=true/' /etc/init/docker.conf
 
 echo $HOSTNAME > /home/git/HOSTNAME