[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-597-gc4ef05b
Holger Levsen
holger at layer-acht.org
Sun May 27 12:46:51 UTC 2012
The following commit has been merged in the develop branch:
commit c4ef05b2b33ed77f91811bc38c06af2d51fb11e8
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun May 27 14:38:36 2012 +0200
update-piuparts-setup: update to use piuparts.git only
diff --git a/home/piupartss/bin/update-piuparts-setup b/home/piupartss/bin/update-piuparts-setup
index 011ab45..bae93ab 100755
--- a/home/piupartss/bin/update-piuparts-setup
+++ b/home/piupartss/bin/update-piuparts-setup
@@ -4,7 +4,7 @@
# update piuparts setup on piatti.debian.org
#
-# Copyright 2009-2011 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2012 Holger Levsen (holger at layer-acht.org)
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -27,23 +27,27 @@ fi
set -e
-#
-# update slave home, mostly scripts
-#
+# please cleanup yourself
cd
-# get rid of svn
-if [ -d .svn ] ; then
- rm .svn -rf
+if [ -d piatti ] ; then
+ echo please rm ~/piatti manually
fi
-if [ ! -d piatti ] ; then
- git clone git://git.debian.org/git/piuparts/piatti.git
- cd piatti
- git checkout piatti
- cd ..
+#
+# update source
+#
+if [ ! -d /org/piuparts.debian.org/src/ ] ; then
+ sudo mkdir -p /org/piuparts.debian.org/src/
+ cd /org/piuparts.debian.org/src/
+ sudo chown piupartss:piuparts /org/piuparts.debian.org/src
+ sudo chmod 755 /org/piuparts.debian.org/src
+ git clone git://git.debian.org/git/piuparts/piuparts.git
+ cd piuparts
+ git checkout piatti
fi
-cd piatti
-
+cd /org/piuparts.debian.org/src/piuparts
+pwd
+SRCDIR=$(pwd)
# git checkout branch if $1 is given
if [ ! -z "$1" ] ; then
git checkout $1
@@ -55,9 +59,19 @@ if [ ! -z "$2" ] ; then
git pull $2 $1
fi
+sudo make prefix=/org/piuparts.debian.org docdir=/org/piuparts.debian.org/htdocs/doc/ install install-doc
+
+#
+# create working dir
+#
+sudo mkdir -p /org/piuparts.debian.org/tmp
+
+#
+# update slave home, mostly scripts
+#
cd
-cp -r piatti/home/piupartss/* .
-cp -r piatti/home/piupartss/.forward .
+cp -r $SRCDIR/home/piupartss/* .
+cp -r $SRCDIR/home/piupartss/.forward .
pwd
crontab crontab
@@ -68,22 +82,14 @@ crontab crontab
# by the group, which prevents ssh logins...
#
cd ~piupartsm
-# rm .svn
-if [ -d .svn ] ; then
- sudo rm .svn -rf
-fi
-sudo su - piupartsm -c "cp -r ~piupartss/piatti/home/piupartsm/* . ; cp -ax ~piupartss/piatti/home/piupartsm/.forward ."
+sudo su - piupartsm -c "cp -r $SRCDIR/home/piupartsm/* . ; cp -ax $SRCDIR/home/piupartsm/.forward ."
sudo su - piupartsm -c "crontab crontab"
#
# update /org/piuparts.debian.org
#
-# rm .svn
-if [ -d /org/piuparts.debian.org/.svn ] ; then
- rm /org/piuparts.debian.org/.svn -rf
-fi
if [ ! -d /org/piuparts.debian.org/ ] ; then
sudo mkdir -p /org/piuparts.debian.org/
sudo chown piupartss:piuparts /org/piuparts.debian.org/
@@ -91,7 +97,7 @@ if [ ! -d /org/piuparts.debian.org/ ] ; then
fi
cd /org/piuparts.debian.org/
pwd
-cp -r ~piupartss/piatti/org/piuparts.debian.org/* .
+cp -r $SRCDIR/org/piuparts.debian.org/* .
mkdir -p master slave backup
sudo chown piupartss:piuparts slave
sudo chown piupartsm:piuparts master htdocs backup
@@ -101,39 +107,4 @@ cd /org/piuparts.debian.org/etc
HOSTNAME=`hostname`
ln -sf piuparts.conf.$HOSTNAME piuparts.conf
-#
-# update source
-#
-# rm .svn
-if [ -d /org/piuparts.debian.org/src/.svn ] ; then
- rm /org/piuparts.debian.org/src/ -rf
-fi
-if [ ! -d /org/piuparts.debian.org/src/ ] ; then
- sudo mkdir -p /org/piuparts.debian.org/src/
- cd /org/piuparts.debian.org/src/
- sudo chown piupartss:piuparts /org/piuparts.debian.org/src
- sudo chmod 755 /org/piuparts.debian.org/src
- git clone git://git.debian.org/git/piuparts/piuparts.git
- cd piuparts
- git checkout piatti
-fi
-cd /org/piuparts.debian.org/src/piuparts
-pwd
-# git checkout branch if $1 is given
-if [ ! -z "$1" ] ; then
- git checkout $1
-fi
-
-# git fetch+pull if $2 is given
-if [ ! -z "$2" ] ; then
- git fetch $2
- git pull $2 $1
-fi
-
-sudo make prefix=/org/piuparts.debian.org docdir=/org/piuparts.debian.org/htdocs/doc/ install install-doc
-
-#
-# create working dir
-#
-sudo mkdir -p /org/piuparts.debian.org/tmp
--
piuparts git repository
More information about the Piuparts-commits
mailing list