www/proprietary proprietary.html workshop/mal.r...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/07/13 05:51:08

Modified files:
        proprietary    : proprietary.html 
        proprietary/workshop: mal.rec update-item-count 

Log message:
        Fix typos in mal.rec & regenerate proprietary.html.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.html?cvsroot=www&r1=1.223&r2=1.224
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/mal.rec?cvsroot=www&r1=1.211&r2=1.212
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/update-item-count?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: proprietary.html
===================================================================
RCS file: /webcvs/www/www/proprietary/proprietary.html,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- proprietary.html    13 Jul 2020 09:08:49 -0000      1.223
+++ proprietary.html    13 Jul 2020 09:51:07 -0000      1.224
@@ -184,12 +184,12 @@
     <p>&ldquo;Bossware&rdquo; is malware that bosses <a
     
href="https://www.eff.org/deeplinks/2020/06/inside-invasive-secretive-bossware-tracking-workers";>
     coerce workers into installing in their own computers</a>, so the
-    bosses can spy on these.</p>
+    bosses can spy on them.</p>
 
     <p>This shows why requiring the user's &ldquo;consent&rdquo; is not
     an adequate basis for protecting digital privacy.  The boss can coerce
     most workers into consenting to almost anything, even probable exposure
-    to contageous disease that can be fatal.  Software like this should
+    to contagious disease that can be fatal.  Software like this should
     be illegal and bosses that demand it should be prosecuted for it.</p>
   </li>
 
@@ -287,7 +287,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/13 09:08:49 $
+$Date: 2020/07/13 09:51:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: workshop/mal.rec
===================================================================
RCS file: /webcvs/www/www/proprietary/workshop/mal.rec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- workshop/mal.rec    9 Jul 2020 07:35:39 -0000       1.211
+++ workshop/mal.rec    13 Jul 2020 09:51:07 -0000      1.212
@@ -33,12 +33,12 @@
 Blurb: <p>&ldquo;Bossware&rdquo; is malware that bosses <a
 +   
href="https://www.eff.org/deeplinks/2020/06/inside-invasive-secretive-bossware-tracking-workers";>
 +   coerce workers into installing in their own computers</a>, so the
-+   bosses can spy on these.</p>
++   bosses can spy on them.</p>
 +
 +   <p>This shows why requiring the user's &ldquo;consent&rdquo; is not
 +   an adequate basis for protecting digital privacy.  The boss can coerce
 +   most workers into consenting to almost anything, even probable exposure
-+   to contageous disease that can be fatal.  Software like this should
++   to contagious disease that can be fatal.  Software like this should
 +   be illegal and bosses that demand it should be prosecuted for it.</p>
 
 Added: 2020-07-09

Index: workshop/update-item-count
===================================================================
RCS file: /webcvs/www/www/proprietary/workshop/update-item-count,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- workshop/update-item-count  4 Feb 2019 07:12:22 -0000       1.2
+++ workshop/update-item-count  13 Jul 2020 09:51:07 -0000      1.3
@@ -19,11 +19,11 @@
 
 # Get the number of items, and approximate it to the nearest 50.
 item_count=$(grep -Ec '^Id: 20[0-9]{7}$' mal.rec)
-i=$((item_count/50))
-i=$((i*50))
+i=$((item_count/10))
+i=$((i*10))
 d=$((item_count%50))
-if [ $d -ge 25 ]; then
-  i=$((i+50))
+if [ $d -ge 5 ]; then
+  i=$((i+10))
 fi
 
 # Get the number of links, and approximate it to the lower 50.
@@ -39,15 +39,15 @@
   }' | sort -u | wc -l)
 # The page says, "more than $l references", so
 # when e.g. link_count is exactly 350, l should be 300.
-l=$(((link_count - 1)/50))
-l=$((l*50))
+l=$(((link_count - 1)/10))
+l=$((l*10))
 
 # Check if the numbers to put in proprietary.html and
 # free-software-even-more-important.html changed, update the files
 # as needed.
 month=$(date +'%B, %Y')
-if ! grep -q "list around $i\>" ../proprietary.html \
-   || ! grep -q "more than $l references" ../proprietary.html; then
+#if ! grep -q "list around $i\>" ../proprietary.html \
+#   || ! grep -q "more than $l references" ../proprietary.html; then
   sed -i "
   s|As of .*, the pages in this directory list .*$|As of $month, the pages in 
this directory list around $i|
   s|functionalities (with .* references|functionalities (with more than $l 
references|
@@ -58,9 +58,9 @@
      exit 1
   fi
   echo "Malware count was updated in proprietary.html."
-fi
+#fi
 f=../../philosophy/free-software-even-more-important.html
-if ! grep -q "lists around $i different" $f; then
+#if ! grep -q "lists around $i different" $f; then
   sed -i "
   s|That directory lists around .* different|That directory lists around $i 
different|
   s|malicious functionalities (as of .*),|malicious functionalities (as of 
$month),|
@@ -71,4 +71,4 @@
      exit 1
   fi
   echo "Malware count was updated in ${f#../../}."
-fi
+#fi