Changeset 404 in MondoRescue for trunk/tools/livwww

Timestamp:

Feb 18, 2006, 2:42:48 PM (18 years ago)

Author:

bcornec

Message:

merge -r397:402 $SVN_M/branches/stable

File:

• trunk/tools/livwww (modified) (3 diffs)

trunk/tools/livwww

@@ -8 +8 @@
 # Please replace with your destination
 #
-DESTDIR=/var/www/html/mondo
-DESTMACH=www1.mondorescue.org
+
+
+LOCALDIR=/var/www/html/mondo
+LOCALDOC=/var/www/html/mondo-doc
 DESTUSER=apache
 MONDODIR=/mondo/www/html/mondo
 TESTDIR=/mondo/www/html/test
 
+force=0
+
+if [ "$1" = "-f" ]; then
+        force=1
+        optsvn=""
+        shift
+else
+        optsvn="--force"
+fi
+
+/sbin/ifconfig | grep -q 10.3 2>&1 > /dev/null
+if [ $? = 0 ]; then
+    DESTMACH=mondo.hpintelco.org
+else
+    DESTMACH=www1.mondorescue.org
+fi
 
 dname=`dirname $0`
@@ -25 +43 @@
 . $TOOLHOME/common-env
 
-rm -rf $DESTDIR
-cp -a ${BASE}/svn/${VER}/website $DESTDIR
-cp -a ${BASE}/svn/${VER}/documentation/* $DESTDIR/docs
-find $DESTDIR -type d | xargs chmod 755
-find $DESTDIR -type f | xargs chmod 644
-cd $DESTDIR
+cd ${BASE}/svn
+
+if [ $force -eq 1 ]; then
+    echo "Purging $LOCALDIR"
+    rm -rf $LOCALDIR
+fi
+
+svn export $optsvn ${VER}/website $LOCALDIR
+
+if [ $force -eq 1 ]; then
+    echo "Purging $LOCALDOC"
+    rm -rf $LOCALDOC
+fi
+
+svn export $optsvn ${VER}/documentation $LOCALDOC
+
+#
+# Version handling
+#
+$TOOLHOME/expandver $LOCALDIR/top.shtml $LOCALDOC/mondorescue-howto.sgml $LOCALDOC/*.8; do
+
+cd $LOCALDOC
+make -f Makefile.howto
+make -f Makefile.man
+mv $LOCALDOC $LOCALDIR/docs
+#
+# Man pages corrections
+#
+perl -pi -e 's~/man8/~/docs/~g' $LOCALDIR/docs/*.8.html
+perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
+perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html 
+find $LOCALDIR -type d | xargs chmod 755
+find $LOCALDIR -type f | xargs chmod 644
+
+cd $LOCALDIR
+#
+# Some links for the Web site
+#
+ln -sf /var/www/html/mediawiki .
+ln -sf /var/www/html/admin .
+
 if [ _"$1" == _"" ]; then
         exit 0
@@ -40 +93 @@
     fi
 fi
-tar cfj /tmp/mondo-www.tz2 .
+tar cfz /tmp/mondo-www.tgz .
 ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
-scp /tmp/mondo-www.tz2 ${DESTUSER}@${DESTMACH}:/tmp
-ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfj /tmp/mondo-www.tz2"
+scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
+rm -f /tmp/mondo-www.tgz
+ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"