Changeset 404 for trunk/tools


Ignore:
Timestamp:
Feb 18, 2006, 2:42:48 PM (13 years ago)
Author:
bcornec
Message:

merge -r397:402 $SVN_M/branches/stable

Location:
trunk/tools
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/livwww

    r387 r404  
    88# Please replace with your destination
    99#
    10 DESTDIR=/var/www/html/mondo
    11 DESTMACH=www1.mondorescue.org
     10
     11
     12LOCALDIR=/var/www/html/mondo
     13LOCALDOC=/var/www/html/mondo-doc
    1214DESTUSER=apache
    1315MONDODIR=/mondo/www/html/mondo
    1416TESTDIR=/mondo/www/html/test
    1517
     18force=0
     19
     20if [ "$1" = "-f" ]; then
     21        force=1
     22        optsvn=""
     23        shift
     24else
     25        optsvn="--force"
     26fi
     27
     28/sbin/ifconfig | grep -q 10.3 2>&1 > /dev/null
     29if [ $? = 0 ]; then
     30    DESTMACH=mondo.hpintelco.org
     31else
     32    DESTMACH=www1.mondorescue.org
     33fi
    1634
    1735dname=`dirname $0`
     
    2543. $TOOLHOME/common-env
    2644
    27 rm -rf $DESTDIR
    28 cp -a ${BASE}/svn/${VER}/website $DESTDIR
    29 cp -a ${BASE}/svn/${VER}/documentation/* $DESTDIR/docs
    30 find $DESTDIR -type d | xargs chmod 755
    31 find $DESTDIR -type f | xargs chmod 644
    32 cd $DESTDIR
     45cd ${BASE}/svn
     46
     47if [ $force -eq 1 ]; then
     48    echo "Purging $LOCALDIR"
     49    rm -rf $LOCALDIR
     50fi
     51
     52svn export $optsvn ${VER}/website $LOCALDIR
     53
     54if [ $force -eq 1 ]; then
     55    echo "Purging $LOCALDOC"
     56    rm -rf $LOCALDOC
     57fi
     58
     59svn export $optsvn ${VER}/documentation $LOCALDOC
     60
     61#
     62# Version handling
     63#
     64$TOOLHOME/expandver $LOCALDIR/top.shtml $LOCALDOC/mondorescue-howto.sgml $LOCALDOC/*.8; do
     65
     66cd $LOCALDOC
     67make -f Makefile.howto
     68make -f Makefile.man
     69mv $LOCALDOC $LOCALDIR/docs
     70#
     71# Man pages corrections
     72#
     73perl -pi -e 's~/man8/~/docs/~g' $LOCALDIR/docs/*.8.html
     74perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
     75perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html
     76find $LOCALDIR -type d | xargs chmod 755
     77find $LOCALDIR -type f | xargs chmod 644
     78
     79cd $LOCALDIR
     80#
     81# Some links for the Web site
     82#
     83ln -sf /var/www/html/mediawiki .
     84ln -sf /var/www/html/admin .
     85
    3386if [ _"$1" == _"" ]; then
    3487        exit 0
     
    4093    fi
    4194fi
    42 tar cfj /tmp/mondo-www.tz2 .
     95tar cfz /tmp/mondo-www.tgz .
    4396ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
    44 scp /tmp/mondo-www.tz2 ${DESTUSER}@${DESTMACH}:/tmp
    45 ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfj /tmp/mondo-www.tz2"
     97scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
     98rm -f /tmp/mondo-www.tgz
     99ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
  • trunk/tools/mkcommon

    r394 r404  
    3434    svn export ${VER}/mindi mindi-${MINDI_VER}
    3535    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
     36    cp -a ${VER}/documentation/mindi.8 mindi-${MINDI_VER}
     37    rm -rf documentation-${MONDO_VER}
     38    svn export ${VER}/documentation documentation-${MONDO_VER}
     39    cd documentation-${MONDO_VER}
     40    $TOOLHOME/expandver mindi*8
     41    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
     42    cd ..
    3643    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    3744    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
     
    4855    svn export ${VER}/mondo mondo-${MONDO_VER}
    4956    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     57    mkdir -p mondo-${MONDO_VER}/docs/man
     58    cp -a ${VER}/documentation/mondo*.8 mondo-${MONDO_VER}/docs/man
    5059    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    5160    rm -rf documentation-${MONDO_VER}
    5261    svn export ${VER}/documentation documentation-${MONDO_VER}
    5362    cd documentation-${MONDO_VER}
    54     make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
     63    $TOOLHOME/expandver mondorescue-howto.sgml mondo*8
     64    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en
     65    if [ $? != 0 ]; then
     66        exit -1
     67    fi
     68    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
    5569    if [ $? != 0 ]; then
    5670        exit -1
  • trunk/tools/mkdeliv

    r337 r404  
    11#!/bin/bash
    22#
    3 # Deliver RPMs packages and tgz files to BerliOS
     3# Deliver RPMs packages and tgz files to ftp.mondorescue.org
    44#
    55# $Id$
     
    77
    88# BerliOS FTP/SSH setup
    9 BERLIOSAC=bcornec@shell.berlios.de
    10 DSTDIR=/home/groups/ftp/pub/mondorescue
     9ACCOUNT=bruno@ftp.mondorescue.org
     10DSTDIR=/
    1111FTPSERV="ftp.berlios.de"
    1212FTPDIR="/incoming"
     
    4646    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
    4747fi
    48 echo "Sources delivery to ${BERLIOSAC}:${DSTDIR}/src"
    49 scp ${tgz} ${BERLIOSAC}:${DSTDIR}/src
    50 ssh ${BERLIOSAC} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
    51 echo "Packages delivery to ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}"
    52 scp ${rpms} ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}
    53 scp ${srpms} ${BERLIOSAC}:${DSTDIR}/${ddir}/${dver}
     48echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"
     49scp ${tgz} ${ACCOUNT}:${DSTDIR}/src
     50
     51echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
     52ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
     53scp ${rpms} ${srpms} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
     54
    5455echo "Sources delivery to ${FTPSERV} ${FTPDIR}"
    5556if [ "`which ncftpput`" != "" ]; then
Note: See TracChangeset for help on using the changeset viewer.