[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-27-g90c7016

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 18961553b0cceccefb9b99ca91c46701f5905050
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 23 11:24:57 2012 +0200

    mv home/piupartss/bin/update-piuparts-setup .
    
    this should not be shipped in a package
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index b1ef5fc..b6dbace 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,8 @@ install-conf-4-running-from-git:
 	install -m 0644 home/piupartsm/.forward $(DESTDIR)$(etcdir)/piuparts/forward-master
 	install -m 0644 home/piupartss/.forward $(DESTDIR)$(etcdir)/piuparts/forward-slave
 	install -m 0644 instances/piuparts.conf.* $(DESTDIR)$(etcdir)/piuparts/
+	install -d $(DESTDIR)$(sharedir)/piuparts/slave
+	install -m 0755 update-piuparts-setup $(DESTDIR)$(sharedir)/piuparts/slave/
 
 build:
 	for file in piuparts piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
diff --git a/README_piatti.txt b/README_piatti.txt
index d23fff4..f642add 100644
--- a/README_piatti.txt
+++ b/README_piatti.txt
@@ -30,7 +30,7 @@ piupartss       ALL=(ALL) NOPASSWD: ALL
 
 * sudo apt-get install apt python debootstrap lsof lsb-release python-debian asciidoc xmlto python-rpy r-recommended r-base-dev gs
 * you need a webserver too, if you run the master
-* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob_plain;f=home/piupartss/bin/update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
+* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=develop;a=blob_plain;f=update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
 * mkdir /org/piuparts.debian.org
 * sudo ln -s /org/piuparts.debian.org/etc/piuparts /etc/piuparts
 
@@ -58,7 +58,7 @@ piupartss       ALL=(ALL) NOPASSWD: ALL
 </VirtualHost>
 ----
 
-== Updating the piuparts installtion
+== Updating the piuparts installation
 
 ----
 piupartss at piatti:/org/piuparts.debian.org$ ~/bin/update-piuparts-setup
diff --git a/home/piupartss/bin/update-piuparts-setup b/update-piuparts-setup
similarity index 100%
rename from home/piupartss/bin/update-piuparts-setup
rename to update-piuparts-setup

-- 
piuparts git repository