www/server/staging/proprietary/rec propr-gen

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 18/09/26 16:36:02

Modified files:
        server/staging/proprietary/rec: propr-gen 

Log message:
        Simplify.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/rec/propr-gen?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: propr-gen
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/rec/propr-gen,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- propr-gen   26 Sep 2018 17:50:32 -0000      1.7
+++ propr-gen   26 Sep 2018 20:36:01 -0000      1.8
@@ -12,11 +12,11 @@
 function rec2html () {
 # Converts the blurbs to HTML.
   sed -i -e '1i<ul class="blurbs">' \
-         -e 's,Id:,<li,' \
-         -e 's,<li *-\([0-9]\{9\}\),  <li id="M\1">,' \
+         -e 's,Id: *-\([0-9]\{9\}\).*$,  <li id="M\1">,' \
          -e 's,^$,  </li>\n,' \
          -e 's,^Blurb:[ \t]*,    ,' \
          -e 's,^+, ,' \
+         -e 's,^[ \t]*$,,' \
          -e '$s,$,\n  </li>\n</ul>\n,' $temp2
 }
 
@@ -81,7 +81,7 @@
 cp proprietary-stub.html ../proprietary.html
 recsel -t Malware -p Id,Blurb -e "Added > 20180900" propr-blurbs.rec > $temp2
 rec2html
-sed -i "/<!-- INSERT latest.list -->/r temp" ../proprietary.html
+sed -i "/<!-- INSERT latest.list -->/r $temp2" ../proprietary.html
 sed -i 's/<!-- INSERT .*\.list -->//' ../proprietary.html
 
 exit 0