---
modules/fedora-docs/files/docs-sync | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/modules/fedora-docs/files/docs-sync b/modules/fedora-docs/files/docs-sync
index a7125bc..9425ec3 100755
--- a/modules/fedora-docs/files/docs-sync
+++ b/modules/fedora-docs/files/docs-sync
@@ -1,8 +1,5 @@
#!/bin/sh
-CACHEDIR='/var/cache/docsSite/'
-export CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/fedora
-
function cleanlock()
{
/bin/rm -f /var/lock/$1.lock
@@ -30,35 +27,17 @@ function newlock()
}
newlock docSync
-if [ ! -d $CACHEDIR ]
+if [ ! -d /srv/web/docs ]
then
- echo "CACHEDIR missing"
- mkdir $CACHEDIR
- cd $CACHEDIR
- cvs co -r LIVE web > /dev/null 2>&1
+ echo "/srv/web/docs missing"
+ cd /srv/web
+ git clone
git://git.fedoraproject.org/git/docs/web.git docs
fi
-cd $CACHEDIR
-
-cvs up -d LIVE web > /dev/null 2>&1
-cd web
-sed -i s/project-web/web/g Makefile
-echo starting build
-make tree > /dev/null 2>&1
-cd fedoraweb
-/bin/mkdir -p /srv/web/docs/css/
-/bin/mkdir -p /srv/web/docs/images
-/bin/mkdir -p /srv/web/rhold
-/bin/cp -ad * /srv/web/rhold
-/bin/cp -ad docs/* /srv/web/docs/
-/bin/cp -ad css/* /srv/web/docs/css/
-/bin/cp -ad images/* /srv/web/docs/images/
-
-# For bug #65
-rm -rf /srv/web/docs/package-list/
+cd /srv/web/docs
+git reset --hard
+git pull
/sbin/restorecon -R /srv/web/docs/
-/sbin/restorecon -R /srv/web/rhold/
cleanlock docSync
-
--
1.5.5.6