From 816f3f43ee670083307c5ddec571178a06d1fd6f Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Mon, 3 Oct 2005 19:26:44 +0000
Subject: [PATCH] Clossing dumped scripts with a plain "exit" to prevent && at
 the end of the file when the last <screen> block is a non dumped block.

---
 dump-lfs-scripts.xsl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dump-lfs-scripts.xsl b/dump-lfs-scripts.xsl
index 4f75a42..b645edb 100644
--- a/dump-lfs-scripts.xsl
+++ b/dump-lfs-scripts.xsl
@@ -50,6 +50,7 @@
           <xsl:text>cd $PKGDIR &amp;&amp;&#xA;</xsl:text>
         </xsl:if>
         <xsl:apply-templates select=".//para/userinput | .//screen"/>
+        <xsl:text>exit</xsl:text>
       </exsl:document>
     </xsl:if>
   </xsl:template>
@@ -60,13 +61,6 @@
         <xsl:when test="@role = 'nodump'"/>
         <xsl:otherwise>
           <xsl:apply-templates select="userinput" mode="screen"/>
-          <xsl:if test="position() != last() and
-                  not(contains(string(),'EOF')) and
-                  not(contains(string(),'check')) and
-                  not(ancestor::sect1[@id='ch-tools-stripping'])">
-            <xsl:text> &amp;&amp;</xsl:text>
-          </xsl:if>
-          <xsl:text>&#xA;</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:if>
@@ -92,6 +86,11 @@
         <xsl:apply-templates/>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:if test="not(contains(string(),'EOF')) and
+            not(contains(string(),'check'))">
+      <xsl:text> &amp;&amp;</xsl:text>
+    </xsl:if>
+    <xsl:text>&#xA;</xsl:text>
   </xsl:template>
 
   <xsl:template match="replaceable">