www/prep ftp.html wrappers-and-scripts/ftp_conv...

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       10/09/09 18:50:49

Modified files:
        prep           : ftp.html 
        prep/wrappers-and-scripts: ftp_convert.pl 

Log message:
        avoid spurious ), #601164

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.html?cvsroot=www&r1=1.257&r2=1.258
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/wrappers-and-scripts/ftp_convert.pl?cvsroot=www&r1=1.15&r2=1.16

Patches:
Index: ftp.html
===================================================================
RCS file: /web/www/www/prep/ftp.html,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- ftp.html    18 Aug 2010 22:27:15 -0000      1.257
+++ ftp.html    9 Sep 2010 18:50:41 -0000       1.258
@@ -218,7 +218,7 @@
  <li>Finland <ul>
   <li><a rel="nofollow" 
href="ftp://ftp.funet.fi/pub/gnu/prep/";>ftp://ftp.funet.fi/pub/gnu/prep/</a>  
</li>
   <li><a rel="nofollow" 
href="http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/";>http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/</a>
  </li>
-  <li><a rel="nofollow" 
href="http://www.nic.funet.fi/pub/gnu/alpha/gnu/";>http://www.nic.funet.fi/pub/gnu/alpha/gnu/)</a>
  </li>
+  <li><a rel="nofollow" 
href="http://www.nic.funet.fi/pub/gnu/alpha/gnu/";>http://www.nic.funet.fi/pub/gnu/alpha/gnu/</a>
  </li>
  </ul></li><!-- end of Finland -->
  <li>France <ul>
   <li><a rel="nofollow" 
href="ftp://mirror.cict.fr/gnu/";>ftp://mirror.cict.fr/gnu/</a>  </li>
@@ -259,7 +259,7 @@
   <li><a rel="nofollow" 
href="ftp://gnuftp.uib.no/pub/gnuftp/";>ftp://gnuftp.uib.no/pub/gnuftp/</a>  
</li>
   <li><a rel="nofollow" 
href="http://gnualpha.uib.no/";>http://gnualpha.uib.no/</a>  </li>
   <li><a rel="nofollow" 
href="ftp://gnualpha.uib.no/pub/gnualpha/";>ftp://gnualpha.uib.no/pub/gnualpha/</a>
  </li>
-  <li>rsync://gnualpha.uib.no/gnualpha)  </li>
+  <li>rsync://gnualpha.uib.no/gnualpha  </li>
  </ul></li><!-- end of Norway -->
  <li>Poland <ul>
   <li><a rel="nofollow" 
href="ftp://ftp.task.gda.pl/pub/gnu/";>ftp://ftp.task.gda.pl/pub/gnu/</a>  </li>
@@ -273,7 +273,7 @@
   <li><a rel="nofollow" 
href="http://mirrors.nfsi.pt/gnu/";>http://mirrors.nfsi.pt/gnu/</a>  </li>
   <li><a rel="nofollow" 
href="ftp://mirrors.fe.up.pt/pub/gnu/";>ftp://mirrors.fe.up.pt/pub/gnu/</a>  
</li>
   <li><a rel="nofollow" 
href="http://mirrors.fe.up.pt/pub/gnu/";>http://mirrors.fe.up.pt/pub/gnu/</a>  
</li>
-  <li><a rel="nofollow" 
href="ftp://mirrors.fe.up.pt/pub/gnu-alpha/)">ftp://mirrors.fe.up.pt/pub/gnu-alpha/)</a>
  </li>
+  <li><a rel="nofollow" 
href="ftp://mirrors.fe.up.pt/pub/gnu-alpha/";>ftp://mirrors.fe.up.pt/pub/gnu-alpha/</a>
  </li>
  </ul></li><!-- end of Portugal -->
  <li>Russia <ul>
   <li><a rel="nofollow" 
href="ftp://ftp.chg.ru/pub/gnu/";>ftp://ftp.chg.ru/pub/gnu/</a>  </li>
@@ -379,7 +379,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2010/08/18 22:27:15 $
+$Date: 2010/09/09 18:50:41 $
 <!-- timestamp end -->
 </p>
 </div>

Index: wrappers-and-scripts/ftp_convert.pl
===================================================================
RCS file: /web/www/www/prep/wrappers-and-scripts/ftp_convert.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- wrappers-and-scripts/ftp_convert.pl 26 Jul 2010 21:44:20 -0000      1.15
+++ wrappers-and-scripts/ftp_convert.pl 9 Sep 2010 18:50:46 -0000       1.16
@@ -1,5 +1,5 @@
 #!/usr/local/bin/perl -w
-# $Id: ftp_convert.pl,v 1.15 2010/07/26 21:44:20 karl Exp $
+# $Id: ftp_convert.pl,v 1.16 2010/09/09 18:50:46 karl Exp $
 #
 # Converts the FTP file to a html file - just prints on the standard out
 # and it is the responsibility of who ever running this to redirect to a 
@@ -32,6 +32,7 @@
 
 sub display_link {
     my ($url, $display) = @_;
+    $url =~ s/\)$//;  # omit the ) in url's
     $display = $url if !defined($display);
     if ($state == 1) {
         return qq(<a href="$url">$display</a>);
@@ -169,7 +170,9 @@
       if ($ftpsite =~ /((http|ftp):\S+)/) {
         print &display_link($1);
       } else {  # rsync or who-knows; not linkable
-        print "$1";
+        my $val = $1;
+        $val =~ s/\)$// if $val =~ /rsync/;
+        print "$val";
       }
       print "  </li>\n";
     }