From: Thérèse Godefroy <godef.th@free.fr>
Date: Fri, 29 Jan 2016 21:49:52 +0000 (+0100)
Subject: de/assemble-all-pages: fix a bug
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7db46d162e6dd4ccfcafc9b6c8da4a6005386a55;p=enc-live.git

de/assemble-all-pages: fix a bug
---

diff --git a/de/kitchen/assemble-all-pages b/de/kitchen/assemble-all-pages
index 06a7011..75e459c 100755
--- a/de/kitchen/assemble-all-pages
+++ b/de/kitchen/assemble-all-pages
@@ -51,9 +51,6 @@ function close_term () {
   test -z "$OK" && exit $1
 }
 
-scriptdir=${0%\/assemble-all-pages}
-cd $scriptdir
-
 # Create temporary files.
 names=$(mktemp -t aap.XXXXXX)  || close_term 1
 list=$(mktemp -t aap.XXXXXX)   || close_term 1
@@ -65,8 +62,7 @@ trap 'rm -f "$names" "$list" "$before" "$after"' EXIT
 if ls *.t.html > $names  2>/dev/null; then
   sed -i 's,\.t\.html$,,' $names
 else
-  echo "!!! There is no template in this directory.
-    Please move the script to lang/kitchen." && close_term 1
+  echo "*** There is no template in this directory." && close_term 1
 fi
 
 ## Add the includes to the templates.
@@ -103,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/, \