From: Thérèse Godefroy <godef.th@free.fr>
Date: Tue, 19 Aug 2014 14:22:02 +0000 (+0200)
Subject: en: fix bugs in assemble-all-pages.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=baf0977f8e735a1632e812c168127926aa18ddea;p=enc-live.git

en: fix bugs in assemble-all-pages.
---

diff --git a/en/kitchen/assemble-all-pages b/en/kitchen/assemble-all-pages
index 8085524..7cfdb81 100755
--- a/en/kitchen/assemble-all-pages
+++ b/en/kitchen/assemble-all-pages
@@ -52,10 +52,10 @@ function close_term () {
 }
 
 # Create temporary files.
-names=$(mktemp -t aap.XXXXXX)  || close_or_exit 1
-list=$(mktemp -t aap.XXXXXX)   || close_or_exit 1
-before=$(mktemp -t aap.XXXXXX) || close_or_exit 1
-after=$(mktemp -t aap.XXXXXX)  || close_or_exit 1
+names=$(mktemp -t aap.XXXXXX)  || close_term 1
+list=$(mktemp -t aap.XXXXXX)   || close_term 1
+before=$(mktemp -t aap.XXXXXX) || close_term 1
+after=$(mktemp -t aap.XXXXXX)  || close_term 1
 trap 'rm -f "$names" "$list" "$before" "$after"' EXIT
 
 # List all the templates in the working directory.
@@ -81,7 +81,7 @@ while read name; do
     if [ -f "$include" ]; then
       cat $before $include $after > ../$name.html
     else
-      echo "$include is missing." && exit 1
+      echo "$include is missing." && close_term 1
     fi
     sed -i "/^<!-- include virtual=\"$include\"/d" ../$name.html
   done < $list