From: Thérèse Godefroy <godef.th@free.fr>
Date: Fri, 29 Jan 2016 21:25:58 +0000 (+0100)
Subject: assemble-all-pages: fix a bug (stopped working when grep returned nothing)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=eac5d91d8e5e542d27d86066c8f499370f3c138a;p=enc-live.git

assemble-all-pages: fix a bug (stopped working when grep returned nothing)
---

diff --git a/en/kitchen/assemble-all-pages b/en/kitchen/assemble-all-pages
index 7cfdb81..75e459c 100755
--- a/en/kitchen/assemble-all-pages
+++ b/en/kitchen/assemble-all-pages
@@ -99,10 +99,9 @@ echo 'windows' >> $names
 
 while read name ; do
   # Find out which deletions apply.
-  grep '^<!-- START DELETION' ../$name.html \
-  | grep -v "$name" \
-  | sed 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' > $list
-  echo $name
+  grep '^<!-- START DELETION' ../$name.html |
+  grep -v "$name" > $list || true
+  sed -i 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' $list
   # Delete.
   while read deletion; do
     sed -i "/^<!-- START DELETION $deletion/, \
diff --git a/fr/kitchen/assemble-all-pages b/fr/kitchen/assemble-all-pages
index 7cfdb81..75e459c 100755
--- a/fr/kitchen/assemble-all-pages
+++ b/fr/kitchen/assemble-all-pages
@@ -99,10 +99,9 @@ echo 'windows' >> $names
 
 while read name ; do
   # Find out which deletions apply.
-  grep '^<!-- START DELETION' ../$name.html \
-  | grep -v "$name" \
-  | sed 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' > $list
-  echo $name
+  grep '^<!-- START DELETION' ../$name.html |
+  grep -v "$name" > $list || true
+  sed -i 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' $list
   # Delete.
   while read deletion; do
     sed -i "/^<!-- START DELETION $deletion/, \
diff --git a/ru/kitchen/assemble-all-pages b/ru/kitchen/assemble-all-pages
index 6279e6c..75e459c 100755
--- a/ru/kitchen/assemble-all-pages
+++ b/ru/kitchen/assemble-all-pages
@@ -47,9 +47,8 @@ set -e
 set -o pipefail
 
 function close_term () {
-  echo;
-  echo '*** Close the terminal window or press Return.';
-  exit $1
+  printf '\n%s' '*** Close the terminal window or press Return.'; read OK
+  test -z "$OK" && exit $1
 }
 
 # Create temporary files.
@@ -100,10 +99,9 @@ echo 'windows' >> $names
 
 while read name ; do
   # Find out which deletions apply.
-  grep '^<!-- START DELETION' ../$name.html \
-  | grep -v "$name" \
-  | sed 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' > $list
-  echo $name
+  grep '^<!-- START DELETION' ../$name.html |
+  grep -v "$name" > $list || true
+  sed -i 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' $list
   # Delete.
   while read deletion; do
     sed -i "/^<!-- START DELETION $deletion/, \