> From: Bruce Dubbs <[email protected]>
> Date: Tue, 7 Jun 2016 14:47:20 -0500
> Subject: Re: [website] r1350 - in html/trunk: . common
>
> akhiezer wrote:
> >> From: [email protected]
> >> Date: Tue, 07 Jun 2016 17:43:23 -0000
> >> Subject: [website] r1350 - in html/trunk: . common
> >>
> > .
> > .
> >> Modified: html/trunk/common/lfsftp.html
> > .
> > .
> >> + <li><a
> >> href="http://mirror.jaleco.com/lfs/pub/";>http://mirror.jaleco.com/lfs/pub/</a>
> >> + (Washington, DC, USA, 1 Gbps)</li>
> > .
> > .
> >>
> >> Modified: html/trunk/mirrors.html
> > .
> > .
> >> + <li><a href="http://lfs.mirror.jaleco.com/";>Washinton, DC, USA [1
> >> Gbps]</a></li>
> >
> >
> > Different format on different pages, but for essentially same-format
> > info; any partic reason?
>
> Inertia
>
- a suggested patch, per below.
The patch changes 'html/trunk/mirrors.html' to follow - with one
exception (ref below) - the 'html/trunk/common/lfsftp.html' formatting,
for the lists of site-links: for, for such listings, it's usually
preferred to see what the link is, without having to mouse-over or
similar..
The aforenoted exception is that the formatting of link-speeds has
been left as-is; partly because 'html/trunk/common/lfsftp.html'
has inconsistent formatting for link-speeds; and partly as IMO the
' [n Xbps]' form (in 'html/trunk/mirrors.html') is about equally as
readable as the ', n Xbps' form (that is used for most of the items in
'html/trunk/common/lfsftp.html') .
Note that the patch does not correct the apparent 'Washinton' typo
("an exercise for the leader" ;); and the patch if applied would mean
that there were now two instances of it.
(More generally, I'd suggest it's better to maintain such data in
table(s), and aut-gen the html lists from there.)
####
# cmds used to gen patch:
#
$ # wget ....
$
$ tree -apsDF ./lfs-website.old
./lfs-website.old
`-- [drwxr-xr-x 4096 Jun 8 11:38] html/
`-- [drwxr-xr-x 4096 Jun 8 11:39] trunk/
|-- [drwxr-xr-x 4096 Jun 8 11:42] common/
| `-- [-rw-r--r-- 10406 Jun 8 11:37] lfsftp.html
`-- [-rw-r--r-- 9224 Jun 8 11:37] mirrors.html
3 directories, 2 files
$
$ cp -iax ./lfs-website.old ./lfs-website.new
$
#
# \-dfprg.
# Have left link-speed formatting as-is: otherwise have followed current
# 'html/trunk/common/lfsftp.html' formatting.
#
cat ./lfs-website.old/html/trunk/mirrors.html | \
tr '\n' '\0' | \
sed -rue 's@\x00([[:blank:]]*<(h1>Select A Mirror</h1|div
id="footer")>)@\n\1@g' | \
sed -rue '\|^[[:blank:]]*<h1>Select A Mirror</h1>|{
s|([[:blank:]]*)(<li><a
href=")([^"]*)(">)([^<]*)(</a>)(</li>)|\1\2\3\4\3\6\n\1 (\5)\7|g ;
}' | \
tr '\0' '\n' \
> ./lfs-website.new/html/trunk/mirrors.html \
2> ./lfs-website.new_html_trunk_mirrors.html.e ;
$
$ LC_ALL=C TZ=UTC0 diff -Naur ./lfs-website.old/ ./lfs-website.new/ \
> ./lfs-website.old2new.ptch \
2> ./lfs-website.old2new.ptch.e ;
$
$ cat ./lfs-website.old2new.ptch ;
.
# ref patch, below.
.
$
#
####
# ptch: apply using '-Np1 ...' :
#
================== Start of Patch ==================
diff -Naur ./lfs-website.old//html/trunk/mirrors.html
./lfs-website.new//html/trunk/mirrors.html
--- ./lfs-website.old//html/trunk/mirrors.html 2016-06-08 10:37:12.493000000
+0000
+++ ./lfs-website.new//html/trunk/mirrors.html 2016-06-08 10:59:21.203000000
+0000
@@ -96,62 +96,102 @@
<h2>North America</h2>
<ul>
- <li><a href="http://www.linuxfromscratch.org/";>Calgary, Alberta,
Canada [155 Mbps]</a></li>
- <li><a href="http://lfs.osuosl.org/";>Corvallis, OR, USA [310
Mbps]</a></li>
- <li><a href="http://lfs.tuliomuniz.org/";>Dallas, TX, USA [1
Gbps]</a></li>
- <li><a href="http://lfs-matrix.net/";>Los Angeles, CA, USA [200
Mbps]</a></li>
-<!-- <li><a href="http://lfs.mirrors.poorlymade.org/";>New York, USA
[100 Mbps]</a></li> -->
+ <li><a
href="http://www.linuxfromscratch.org/";>http://www.linuxfromscratch.org/</a>
+ (Calgary, Alberta, Canada [155 Mbps])</li>
+ <li><a href="http://lfs.osuosl.org/";>http://lfs.osuosl.org/</a>
+ (Corvallis, OR, USA [310 Mbps])</li>
+ <li><a href="http://lfs.tuliomuniz.org/";>http://lfs.tuliomuniz.org/</a>
+ (Dallas, TX, USA [1 Gbps])</li>
+ <li><a href="http://lfs-matrix.net/";>http://lfs-matrix.net/</a>
+ (Los Angeles, CA, USA [200 Mbps])</li>
+<!-- <li><a
href="http://lfs.mirrors.poorlymade.org/";>http://lfs.mirrors.poorlymade.org/</a>
+ (New York, USA [100 Mbps])</li> -->
<!-- 107.170.111.205 -->
- <li><a href="http://lfs.mirrors.hoobly.com";>San Jose, CA, USA [1
Gbps]</a></li>
-<!-- <li><a href="http://lfs.introspeed.com/";>Dallas, TX, USA [10
Mbps]</a></li> -->
- <li><a href="http://lfs.mirror.jaleco.com/";>Washinton, DC, USA [1
Gbps]</a></li>
+ <li><a
href="http://lfs.mirrors.hoobly.com";>http://lfs.mirrors.hoobly.com</a>
+ (San Jose, CA, USA [1 Gbps])</li>
+<!-- <li><a
href="http://lfs.introspeed.com/";>http://lfs.introspeed.com/</a>
+ (Dallas, TX, USA [10 Mbps])</li> -->
+ <li><a
href="http://lfs.mirror.jaleco.com/";>http://lfs.mirror.jaleco.com/</a>
+ (Washinton, DC, USA [1 Gbps])</li>
</ul>
<!--
<h2>South America</h2>
<ul>
- <li><a href="http://lfsmirror.lfs-es.info/";>Rosario, Argentina [100
Mbps]</a></li>
+ <li><a
href="http://lfsmirror.lfs-es.info/";>http://lfsmirror.lfs-es.info/</a>
+ (Rosario, Argentina [100 Mbps])</li>
</ul>
-->
<h2>Europe</h2>
<ul>
- <li><a href="http://www.nl.linuxfromscratch.org/";>Amsterdam, The
Netherlands [100 Mbps]</a></li>
-<!-- <li><a href="http://linuxfromscratch.xtra-net.org/";>Brussels,
Belgium [2 Mbps]</a></li> -->
-<!-- <li><a href="http://lfs.linux-mirror.org/";>Cologne, Germany [100
Mbps]</a></li> -->
- <li><a href="http://www.de.linuxfromscratch.org/";>Frankfurt, Germany
(1000 Mbps)</a></li>
- <li><a href="http://mirror.vtx.ch/";>Lausanne, Switzerland [155
Mbps]</a></li>
- <li><a href="http://lfs.pilgrims.ru/";>Moscow, Russia [100
Mbps]</a></li>
-<!-- <li><a href="http://lfs.solciel.com/";>Paris, France [100
Mbps]</a></li>-->
-<!-- <li><a href="http://lfs.nwps.ws/";>Roubaix, France [200
Mbps]</a></li>-->
- <li><a href="http://lfs.brahman.tk/";>St. Zagora, Bulgaria [2.5
Mbps]</a></li>
- <li><a href="http://www.at.linuxfromscratch.org/";>Vienna Univ. of
Technology, Austria [64 Mbps]</a></li>
-<!-- <li><a href="http://lfs.pagefault.net/";>Amsterdam, The Netherlands
[100 Mbps]</a></li>-->
-<!-- <li><a href="http://lfs.lineo.be/";>Antwerp, Belgium [512
Kbps]</a></li> -->
-<!-- <li><a href="http://lfs.scarlet.be/";>Vilvoorde, Belgium [1
Gbps]</a></li> -->
-<!-- <li><a href="http://lfs.wankoo.org/";>Nuernberg, Germany [100
Mbps]</a></li> -->
-<!-- <li><a href="http://lfs.rohost.com/";>Timisoara, Romania [100
Mbps/local 1 Mbps/i18n]</a></li> -->
-<!-- <li><a href="http://www.se.linuxfromscratch.org/";>Karlskrona,
Sweden [10 Mbps]</a></li>-->
-<!-- <li><a href="http://mirror.ibcp.fr/pub/LFS/LFS/";>Lyon, France [100
Mbps]</a></li> -->
-<!-- <li><a href="http://lfs.linuxpourtous.com/";>Marseille, France [512
Kbps]</a></li> -->
-<!-- <li><a href="http://lfs.icx.fr/";>Montpellier, France [2
Mbps]</a></li> -->
+ <li><a
href="http://www.nl.linuxfromscratch.org/";>http://www.nl.linuxfromscratch.org/</a>
+ (Amsterdam, The Netherlands [100 Mbps])</li>
+<!-- <li><a
href="http://linuxfromscratch.xtra-net.org/";>http://linuxfromscratch.xtra-net.org/</a>
+ (Brussels, Belgium [2 Mbps])</li> -->
+<!-- <li><a
href="http://lfs.linux-mirror.org/";>http://lfs.linux-mirror.org/</a>
+ (Cologne, Germany [100 Mbps])</li> -->
+ <li><a
href="http://www.de.linuxfromscratch.org/";>http://www.de.linuxfromscratch.org/</a>
+ (Frankfurt, Germany (1000 Mbps))</li>
+ <li><a href="http://mirror.vtx.ch/";>http://mirror.vtx.ch/</a>
+ (Lausanne, Switzerland [155 Mbps])</li>
+ <li><a href="http://lfs.pilgrims.ru/";>http://lfs.pilgrims.ru/</a>
+ (Moscow, Russia [100 Mbps])</li>
+<!-- <li><a href="http://lfs.solciel.com/";>http://lfs.solciel.com/</a>
+ (Paris, France [100 Mbps])</li>-->
+<!-- <li><a href="http://lfs.nwps.ws/";>http://lfs.nwps.ws/</a>
+ (Roubaix, France [200 Mbps])</li>-->
+ <li><a href="http://lfs.brahman.tk/";>http://lfs.brahman.tk/</a>
+ (St. Zagora, Bulgaria [2.5 Mbps])</li>
+ <li><a
href="http://www.at.linuxfromscratch.org/";>http://www.at.linuxfromscratch.org/</a>
+ (Vienna Univ. of Technology, Austria [64 Mbps])</li>
+<!-- <li><a
href="http://lfs.pagefault.net/";>http://lfs.pagefault.net/</a>
+ (Amsterdam, The Netherlands [100 Mbps])</li>-->
+<!-- <li><a href="http://lfs.lineo.be/";>http://lfs.lineo.be/</a>
+ (Antwerp, Belgium [512 Kbps])</li> -->
+<!-- <li><a href="http://lfs.scarlet.be/";>http://lfs.scarlet.be/</a>
+ (Vilvoorde, Belgium [1 Gbps])</li> -->
+<!-- <li><a href="http://lfs.wankoo.org/";>http://lfs.wankoo.org/</a>
+ (Nuernberg, Germany [100 Mbps])</li> -->
+<!-- <li><a href="http://lfs.rohost.com/";>http://lfs.rohost.com/</a>
+ (Timisoara, Romania [100 Mbps/local 1 Mbps/i18n])</li> -->
+<!-- <li><a
href="http://www.se.linuxfromscratch.org/";>http://www.se.linuxfromscratch.org/</a>
+ (Karlskrona, Sweden [10 Mbps])</li>-->
+<!-- <li><a
href="http://mirror.ibcp.fr/pub/LFS/LFS/";>http://mirror.ibcp.fr/pub/LFS/LFS/</a>
+ (Lyon, France [100 Mbps])</li> -->
+<!-- <li><a
href="http://lfs.linuxpourtous.com/";>http://lfs.linuxpourtous.com/</a>
+ (Marseille, France [512 Kbps])</li> -->
+<!-- <li><a href="http://lfs.icx.fr/";>http://lfs.icx.fr/</a>
+ (Montpellier, France [2 Mbps])</li> -->
<!-- Removed since about 2011. The IT department does not seem to have plans
to mirror LFS again
- <li><a href="http://lfs.cict.fr/";>Toulouse, France [100 Mbps]</a></li>
+ <li><a href="http://lfs.cict.fr/";>http://lfs.cict.fr/</a>
+ (Toulouse, France [100 Mbps])</li>
-->
-<!-- <li><a href="http://lfs.dontuse.ms/";>London Docklands, United
Kingdom [100 Mbps]</a></li> -->
-<!-- <li><a href="http://lfs.oss-mirror.org/";>Dublin, Ireland [100
Mbps]</a></li> -->
-<!-- <li><a href="http://lfs.szift.org/";>Krakow, Poland [1
Mbps]</a></li> -->
-<!-- <li><a href="ftp://lfs.kdv.in.ua/";>Kremenchuk, Ukraine [8
Mbps]</a></li> -->
-<!-- <li><a href="ftp://ftp.kdv.in.ua/";>Kremenchuk, Ukraine [8 Mbps]
[files]</a></li> -->
-<!-- <li><a href="http://lfs.linuxfromscratch.pl/";>Wroclaw, Poland [100
Mbps]</a></li> -->
+<!-- <li><a href="http://lfs.dontuse.ms/";>http://lfs.dontuse.ms/</a>
+ (London Docklands, United Kingdom [100 Mbps])</li> -->
+<!-- <li><a
href="http://lfs.oss-mirror.org/";>http://lfs.oss-mirror.org/</a>
+ (Dublin, Ireland [100 Mbps])</li> -->
+<!-- <li><a href="http://lfs.szift.org/";>http://lfs.szift.org/</a>
+ (Krakow, Poland [1 Mbps])</li> -->
+<!-- <li><a href="ftp://lfs.kdv.in.ua/";>ftp://lfs.kdv.in.ua/</a>
+ (Kremenchuk, Ukraine [8 Mbps])</li> -->
+<!-- <li><a href="ftp://ftp.kdv.in.ua/";>ftp://ftp.kdv.in.ua/</a>
+ (Kremenchuk, Ukraine [8 Mbps] [files])</li> -->
+<!-- <li><a
href="http://lfs.linuxfromscratch.pl/";>http://lfs.linuxfromscratch.pl/</a>
+ (Wroclaw, Poland [100 Mbps])</li> -->
</ul>
<h2>Asia</h2>
<ul>
- <li><a href="http://lfs.phayoune.org/";>Bangkok, Thailand [1
Mbps]</a></li>
-<!-- <li><a href="http://lfs.ohmcoe.com/";>Thailand [100 Mbps]</a></li>
-->
-<!-- <li><a href="http://lfs.in.httpd.co";>Rajkot (Gujarat) India [2
Mbps]</a></li> -->
-<!-- <li><a href="http://lfs.mirror.shizu-net.jp/";>Shizuoka, Japan [100
Mbps]</a></li>-->
-<!-- <li><a href="http://lfs.initworld.com/";>Petah-Tikva, Israel [10
Mbps]</a></li>-->
+ <li><a href="http://lfs.phayoune.org/";>http://lfs.phayoune.org/</a>
+ (Bangkok, Thailand [1 Mbps])</li>
+<!-- <li><a href="http://lfs.ohmcoe.com/";>http://lfs.ohmcoe.com/</a>
+ (Thailand [100 Mbps])</li> -->
+<!-- <li><a href="http://lfs.in.httpd.co";>http://lfs.in.httpd.co</a>
+ (Rajkot (Gujarat) India [2 Mbps])</li> -->
+<!-- <li><a
href="http://lfs.mirror.shizu-net.jp/";>http://lfs.mirror.shizu-net.jp/</a>
+ (Shizuoka, Japan [100 Mbps])</li>-->
+<!-- <li><a
href="http://lfs.initworld.com/";>http://lfs.initworld.com/</a>
+ (Petah-Tikva, Israel [10 Mbps])</li>-->
</ul>
<h1>Files Mirrors</h1>
@@ -159,12 +199,18 @@
<p>If the URL for files in the book are not available, they are also
available at:</p>
<ul>
-<!-- <li><a
href="ftp://ftp.lfs-matrix.net/pub/lfs/lfs-packages";>California, USA</a></li>
-->
- <li><a
href="http://www.go-parts.com/mirrors-usa/lfs/lfs-packages/";>Michigan,
USA</a></li>
-<!-- <li><a
href="http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages";>Texas,
USA</a></li>-->
-<!-- <li><a
href="http://www.go-parts.com/mirrors-ru/lfs/lfs-packages/";>Moscow,
Russia</a></li>-->
-<!-- <li><a href="ftp://lfs.solciel.com/lfs/";>Paris, France</a></li> -->
-<!-- <li><a href="http://nwps.ws/pub/lfs/";>Roubaix, France</a></li> -->
+<!-- <li><a
href="ftp://ftp.lfs-matrix.net/pub/lfs/lfs-packages";>ftp://ftp.lfs-matrix.net/pub/lfs/lfs-packages</a>
+ (California, USA)</li> -->
+ <li><a
href="http://www.go-parts.com/mirrors-usa/lfs/lfs-packages/";>http://www.go-parts.com/mirrors-usa/lfs/lfs-packages/</a>
+ (Michigan, USA)</li>
+<!-- <li><a
href="http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages";>http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages</a>
+ (Texas, USA)</li>-->
+<!-- <li><a
href="http://www.go-parts.com/mirrors-ru/lfs/lfs-packages/";>http://www.go-parts.com/mirrors-ru/lfs/lfs-packages/</a>
+ (Moscow, Russia)</li>-->
+<!-- <li><a
href="ftp://lfs.solciel.com/lfs/";>ftp://lfs.solciel.com/lfs/</a>
+ (Paris, France)</li> -->
+<!-- <li><a href="http://nwps.ws/pub/lfs/";>http://nwps.ws/pub/lfs/</a>
+ (Roubaix, France)</li> -->
</ul>
<br />
=================== End of Patch ===================
#
####
# Fin:
#
##
# fin.
###
--
--
http://lists.linuxfromscratch.org/listinfo/website
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
