Changeset 422 for trunk/tools


Ignore:
Timestamp:
Feb 21, 2006, 12:33:57 PM (13 years ago)
Author:
bcornec
Message:

merge -r418:421 $SVN_M/branches/stable

Location:
trunk/tools
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/tools/livwww

    r418 r422  
    1717
    1818force=0
     19nodoc=0
    1920
    2021if [ "$1" = "-f" ]; then
     
    2223        optsvn=""
    2324        shift
     25elif [ "$1" = "-nodoc" ]; then
     26        nodoc=1
     27        optsvn="--force"
     28        shift
    2429else
    2530        optsvn="--force"
    2631fi
    2732
    28 /sbin/ifconfig | grep -q 10.3 2>&1 > /dev/null
     33/sbin/ifconfig | egrep -q '10\.3' 2>&1 > /dev/null
    2934if [ $? = 0 ]; then
    3035    DESTMACH=mondo.hpintelco.org
     
    6469$TOOLHOME/expandver $LOCALDIR/top.shtml $LOCALDOC/mondorescue-howto.sgml $LOCALDOC/*.8
    6570
    66 cd $LOCALDOC
    67 make -f Makefile.howto
    68 make -f Makefile.man
    69 mv $LOCALDOC $LOCALDIR/docs
    70 #
    71 # Man pages corrections
    72 #
    73 perl -pi -e 's~/man8/~/docs/~g' $LOCALDIR/docs/*.8.html
    74 perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
    75 perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html
     71if [ $nodoc -eq 0 ]; then
     72    cd $LOCALDOC
     73    make -f Makefile.howto
     74    make -f Makefile.man
     75    mv $LOCALDOC $LOCALDIR/docs
     76    #
     77    # Man pages corrections
     78    #
     79    perl -pi -e 's~/man8/~/docs/~g' $LOCALDIR/docs/*.8.html
     80    perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
     81    perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html
     82fi
    7683find $LOCALDIR -type d | xargs chmod 755
    7784find $LOCALDIR -type f | xargs chmod 644
Note: See TracChangeset for help on using the changeset viewer.