Changeset 422 in MondoRescue for trunk

Timestamp:

Feb 21, 2006, 12:33:57 PM (18 years ago)

Author:

bcornec

Message:

merge -r418:421 $SVN_M/branches/stable

Location:

trunk

Files:

• tools/expandver (copied) (copied from branches/stable/tools/expandver )
• tools/livwww (modified) (3 diffs)
• website/latest-news.html (modified) (1 diff)

trunk/tools/livwww

@@ -17 +17 @@
 
 force=0
+nodoc=0
 
 if [ "$1" = "-f" ]; then
@@ -22 +23 @@
         optsvn=""
         shift
+elif [ "$1" = "-nodoc" ]; then
+        nodoc=1
+        optsvn="--force"
+        shift
 else
         optsvn="--force"
 fi
 
-/sbin/ifconfig | grep -q 10.3 2>&1 > /dev/null
+/sbin/ifconfig | egrep -q '10\.3' 2>&1 > /dev/null
 if [ $? = 0 ]; then
     DESTMACH=mondo.hpintelco.org
@@ -64 +69 @@
 $TOOLHOME/expandver $LOCALDIR/top.shtml $LOCALDOC/mondorescue-howto.sgml $LOCALDOC/*.8
 
-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 
+if [ $nodoc -eq 0 ]; then
+    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 
+fi
 find $LOCALDIR -type d | xargs chmod 755
 find $LOCALDIR -type f | xargs chmod 644

trunk/website/latest-news.html

@@ -1 @@
-<p><B>2006-02-05</B> Mondorescue has been officially referenced by the HP OpenSource Portal:
+<p><B>2006-02-21 </B>Mondo Rescue has a new Web site</p>
+<p>Thanks to <a href="http://www.73lab.com">Ayo</a>'s authorization, and after 2 weeks of hard work, we are proud to announce that we now have a new and updated Web site. We hope it will be useful and wait for your feedback.</p>
+<p>You may find it at <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> (IP: 213.30.161.23)</p>
+<p><B>2006-02-05 </B>Mondo Rescue referenced by HP</p>
+<p>Mondorescue has been officially referenced by the HP OpenSource Portal:
 <a href="http://opensource.hp.com/index.php">http://opensource.hp.com/index.php</a> (look in the "Recently released" area)</p>
-<p><B>2006-02-02</B> In our always increasing set of services :-) I'd like to announce the
+<p><B>2006-02-02 </B>Mondo Rescue rsync server available</p>
+<p>In our always increasing set of services :-) I'd like to announce the
 availability of an rsync mirror service for mondo-rescue.
 
 Try rsync rsync.mondorescue.org::</p>
-<p><B>2006-02-01</B> Things are progressing. I've gathered all the packages that were originally on <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> and also added Mike's SuSE RPMs
+<p><B>2006-02-01 </B>Mondo Rescue ftp server available</p>
+<p>Things are progressing. I've gathered all the packages that were originally on <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> and also added Mike's SuSE RPMs
 + all the latest packages I've produced and put them on a new ftp server
 accessible at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a>