www/prep wrappers-and-scripts/ftp_convert.pl ft...

[Fabio Pesari]

CVSROOT:        /web/www
Module name:    www
Changes by:     Fabio Pesari <fabiop>   15/07/15 09:31:07

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

Log message:
        Fixed https links [RT #1030179]

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/wrappers-and-scripts/ftp_convert.pl?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.html?cvsroot=www&r1=1.565&r2=1.566

Patches:
Index: wrappers-and-scripts/ftp_convert.pl
===================================================================
RCS file: /web/www/www/prep/wrappers-and-scripts/ftp_convert.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- wrappers-and-scripts/ftp_convert.pl 28 Feb 2011 23:45:28 -0000      1.19
+++ wrappers-and-scripts/ftp_convert.pl 15 Jul 2015 09:31:03 -0000      1.20
@@ -1,5 +1,5 @@
 #!/usr/local/bin/perl -w
-# $Id: ftp_convert.pl,v 1.19 2011/02/28 23:45:28 karl Exp $
+# $Id: ftp_convert.pl,v 1.20 2015/07/15 09:31:03 fabiop 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 
@@ -54,7 +54,6 @@
 
 $state = 0;
 
-
 while (<>) {
   # Take care of headers
   chomp;
@@ -112,8 +111,8 @@
     print "  <li>";
     s/^\t-//;
 
-    if (/http:\S+/) {
-      s/(\b\S*http:\S*\b)([\.\s]*)/&display_link($1)."$2"/eg;
+    if (/https?:\S+/) {
+      s/(\b\S*https?:\S*\b)([\.\s]*)/&display_link($1)."$2"/eg;
       next;
     }
     if (/ftp\.\S+/) {
@@ -125,8 +124,8 @@
 
   # Is this a filename sitting on its own?
   if (/^\t/) {
-    if (/http:\S+/) {
-      s/(\b\S*http:\S*\b)([\.\s]*)/&display_link($1)."$2"/eg;
+    if (/https?:\S+/) {
+      s/(\b\S*https?:\S*\b)([\.\s]*)/&display_link($1)."$2"/eg;
       next;
     }
     if (/ftp\.\S+/) {
@@ -137,7 +136,6 @@
     next;
   }
 
-
   if ($start_of_ftp_list == 1) {
     if (/^(.+?):\s?$/) {
       # Continent
@@ -175,7 +173,7 @@
     foreach $ftpsite (@ftp_sites) {
       print "  <li>";
       ($actual_bits,$extra_bits) = ($ftpsite =~ /(\S+)(.*$)/);
-      if ($ftpsite =~ /((http|ftp):\S+)/) {
+      if ($ftpsite =~ /((https?|ftp):\S+)/) {
         print &display_link($1);
       } else {  # rsync or who-knows; not linkable
         my $val = $1;
@@ -199,8 +197,8 @@
     s/(address@hidden)/&display_link("mailto:$1";, "&lt;$1&gt;")/eg;
     next;
   }
-  if (/http:\S+/) {
-    s/(\b\S*http:\S*\b)([\.\s]*)/&display_link($1)."$2"/eg;
+  if (/https?:\S+/) {
+    s/(\b\S*https?:\S*\b)([\.\s]*)/&display_link($1)."$2"/eg;
     next;
   }
 

Index: ftp.html
===================================================================
RCS file: /web/www/www/prep/ftp.html,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -b -r1.565 -r1.566
--- ftp.html    4 Jul 2015 14:06:51 -0000       1.565
+++ ftp.html    15 Jul 2015 09:31:04 -0000      1.566
@@ -345,11 +345,11 @@
  <li>France
  <ul>
   <li><a rel="nofollow" 
href="http://mirror0.babylon.network/gnu";>http://mirror0.babylon.network/gnu</a></li>
-  <li>https://mirror0.babylon.network/gnu</li>
+  <li><a rel="nofollow" 
href="https://mirror0.babylon.network/gnu";>https://mirror0.babylon.network/gnu</a></li>
   <li><a rel="nofollow" 
href="ftp://mirror0.babylon.network/gnu";>ftp://mirror0.babylon.network/gnu</a></li>
   <li>rsync://mirror0.babylon.network/gnu</li>
   <li><a rel="nofollow" 
href="http://mirror1.babylon.network/gnu";>http://mirror1.babylon.network/gnu</a></li>
-  <li>https://mirror1.babylon.network/gnu</li>
+  <li><a rel="nofollow" 
href="https://mirror1.babylon.network/gnu";>https://mirror1.babylon.network/gnu</a></li>
   <li><a rel="nofollow" 
href="ftp://mirror1.babylon.network/gnu";>ftp://mirror1.babylon.network/gnu</a></li>
   <li>rsync://mirror1.babylon.network/gnu</li>
   <li><a rel="nofollow" 
href="http://mirror.ibcp.fr/pub/gnu/";>http://mirror.ibcp.fr/pub/gnu/</a></li>
@@ -380,7 +380,7 @@
   <li><a rel="nofollow" 
href="ftp://mirror.netcologne.de/gnu";>ftp://mirror.netcologne.de/gnu</a></li>
   <li>rsync://mirror.netcologne.de/gnu</li>
   <li><a rel="nofollow" 
href="http://mirror.unicorncloud.org/gnu/";>http://mirror.unicorncloud.org/gnu/</a></li>
-  <li>https://mirror.unicorncloud.org/gnu/</li>
+  <li><a rel="nofollow" 
href="https://mirror.unicorncloud.org/gnu/";>https://mirror.unicorncloud.org/gnu/</a></li>
  </ul></li><!-- end of Germany -->
  <li>Greece
  <ul>
@@ -402,7 +402,7 @@
  <li>Netherlands
  <ul>
   <li><a rel="nofollow" 
href="http://mirror2.babylon.network/gnu";>http://mirror2.babylon.network/gnu</a></li>
-  <li>https://mirror2.babylon.network/gnu</li>
+  <li><a rel="nofollow" 
href="https://mirror2.babylon.network/gnu";>https://mirror2.babylon.network/gnu</a></li>
   <li><a rel="nofollow" 
href="ftp://mirror2.babylon.network/gnu";>ftp://mirror2.babylon.network/gnu</a></li>
   <li>rsync://mirror2.babylon.network/gnu</li>
   <li><a rel="nofollow" 
href="ftp://ftp.nluug.nl/pub/gnu/";>ftp://ftp.nluug.nl/pub/gnu/</a></li>
@@ -449,7 +449,7 @@
   <li><a rel="nofollow" 
href="http://mirror.tochlab.net/pub/gnu/";>http://mirror.tochlab.net/pub/gnu/</a></li>
   <li><a rel="nofollow" 
href="ftp://mirror.tochlab.net/pub/gnu/";>ftp://mirror.tochlab.net/pub/gnu/</a></li>
   <li><a rel="nofollow" 
href="http://dgix.ru/mirrors/gnu/";>http://dgix.ru/mirrors/gnu/</a></li>
-  <li>https://dgix.ru/mirrors/gnu/</li>
+  <li><a rel="nofollow" 
href="https://dgix.ru/mirrors/gnu/";>https://dgix.ru/mirrors/gnu/</a></li>
   <li>rsync://dgix.ru/mirrors/gnu/</li>
  </ul></li><!-- end of Russia -->
  <li>Serbia
@@ -601,7 +601,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/07/04 14:06:51 $
+$Date: 2015/07/15 09:31:04 $
 <!-- timestamp end -->
 </p>
 </div>