[commit-womb] gnumaint gm-generate.pl

[Therese Godefroy]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Therese Godefroy <th_g> 18/11/21 03:36:12

Modified files:
        .              : gm-generate.pl 

Log message:
        Use logo thumbnails instead of original images; fix a warning with 
https URLs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.19&r2=1.20

Patches:
Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gm-generate.pl      12 Nov 2018 22:18:57 -0000      1.19
+++ gm-generate.pl      21 Nov 2018 08:36:12 -0000      1.20
@@ -1,4 +1,4 @@
-# $Id: gm-generate.pl,v 1.19 2018/11/12 22:18:57 brandon Exp $
+# $Id: gm-generate.pl,v 1.20 2018/11/21 08:36:12 th_g Exp $
 # The generate actions for the gm script (see --help message).
 # 
 # Copyright 2007, 2008, 2009, 2010, 2012, 2013, 2014
@@ -36,7 +36,7 @@
     next unless $logo;
     
     push (@ret, qq!<tr><td><a href="/software/$pkgname/">$pkgname</a></td>!);
-    push (@ret, qq!    <td><img alt="$pkgname" src="$logo" /></td></tr>\n!);
+    push (@ret, qq!    <td><img alt="$pkgname" 
src="/graphics/pkg-logos-250x100/$pkgname.250x100.png" /></td></tr>\n!);
   }
 
   push (@ret, "</table>");
@@ -298,7 +298,7 @@
       for (my $i = 0; $i < @shop; $i += 2) {
         my $title = $shop[$i];
         my $url = $shop[$i+1];
-        if ($url !~ /http:/) {
+        if ($url !~ /https?:/) {
           warn (&gnupkgs_msg ("doc-shop url lacks http (misordered?)\n",%pkg));
         }
         push (@books, qq!\n       <cite><a href="$url">$title</a></cite>!);
@@ -375,7 +375,7 @@
 
     # Include the package logo (scaled) in the head, if there is one.
     $logo_xhtml = $pkglogo
-      ?    qq!\n  <img src="$pkglogo" style="height:1em"\n!
+      ?    qq!\n  <img src="/graphics/pkg-logos-250x100/$pkgname.250x100.png" 
style="height:1em"\n!
          . qq!       alt="logo for $pkgname" />!
       : "";