[Blends-commit] [SCM] website branch, master, updated. abef54a8a882c21c780938d54585f701ce6ec9f1

[Andreas Tille]

The following commit has been merged in the master branch:
commit abef54a8a882c21c780938d54585f701ce6ec9f1
Author: Andreas Tille <tille at debian.org>
Date:   Wed Oct 24 14:27:20 2012 +0200

    Replace old scripts intended to deploy dynamic and static pages from SVN by script which pulls from new Git and does the postprocessing (locale generation, setting of pemissions)

diff --git a/webtools/deploy-dynamic-pages b/webtools/deploy-dynamic-pages
deleted file mode 100755
index 50151ba..0000000
--- a/webtools/deploy-dynamic-pages
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-umask 002
-
-#REPOS=$1
-#REV=$2
-URL_REPOS="svn://svn.debian.org/svn/blends/blends/trunk/webtools"
-# URL_REPOS="svn+ssh://svn.debian.org/svn/blends/blends/trunk/webtools"
-BASE=/var/lib/gforge/chroot/home/groups/blends
-
-echo "Deploy website..."
-tmpdir=`mktemp -p $BASE -d`
-svn --force export $URL_REPOS $tmpdir/webtools > /dev/null
-rsync -rlpoDzu --delete --exclude .gitignore --exclude .svnignore \
-      --exclude cache \
-      --exclude logs \
-      $tmpdir/webtools $BASE
-rm -rf $tmpdir
-
-cd $BASE/webtools
-./mkmo.sh
-
-# Somehow blend-get-names is not executable ... workaround
-chmod 775 blend-get-names
-
-# ensure the Group has write permissions...
-chmod -R g+w $BASE/webtools
diff --git a/webtools/deploy-repository b/webtools/deploy-repository
new file mode 100755
index 0000000..b3ecea7
--- /dev/null
+++ b/webtools/deploy-repository
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+umask 002
+
+NAME=website
+URL_REPOS="git://git.debian.org/git/blends/${NAME}.git"
+BASE=/var/lib/gforge/chroot/home/groups/blends
+
+if [ -d ${BASE} ] ; then
+    cd ${BASE}
+    git pull
+else
+    tmpdir=`mktemp --directory`
+    cd $tmpdir
+    git clone ${URL_REPOS}
+    mv ${NAME} ${BASE}
+    cd
+    rm -rf $tmpdir
+    cd ${BASE}
+fi
+
+cd $BASE/webtools
+./mkmo.sh
+
+# ensure the Group has write permissions...
+chgrp -R blends $BASE/* $BASE/.g*
+chmod -R g+w $BASE/*
diff --git a/webtools/deploy-static-pages b/webtools/deploy-static-pages
deleted file mode 100755
index c82dc26..0000000
--- a/webtools/deploy-static-pages
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-umask 002
-
-#REPOS=$1
-#REV=$2
-URL_REPOS="svn://svn.debian.org/svn/blends/blends/trunk/websites"
-# URL_REPOS="svn+ssh://svn.debian.org/svn/blends/blends/trunk/websites"
-BASE=/var/lib/gforge/chroot/home/groups/blends/htdocs
-
-echo "Deploy website..."
-tmpdir=`mktemp -p $BASE -d`
-svn --force export $URL_REPOS $tmpdir/websites > /dev/null
-rsync -rlpoDzu --delete --exclude .gitignore --exclude .svnignore \
-      --exclude bugs --exclude tasks \
-      --exclude `basename $0` \
-      $tmpdir/websites/* $BASE
-rm -rf $tmpdir

-- 
Static and dynamic websites for Debian Pure Blends