r2065 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Oct 3 12:26:44 PDT 2005


Author: manuel
Date: 2005-10-03 13:26:44 -0600 (Mon, 03 Oct 2005)
New Revision: 2065

Modified:
   jhalfs/trunk/dump-lfs-scripts.xsl
Log:
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.

Modified: jhalfs/trunk/dump-lfs-scripts.xsl
===================================================================
--- jhalfs/trunk/dump-lfs-scripts.xsl	2005-10-03 18:28:57 UTC (rev 2064)
+++ jhalfs/trunk/dump-lfs-scripts.xsl	2005-10-03 19:26:44 UTC (rev 2065)
@@ -50,6 +50,7 @@
           <xsl:text>cd $PKGDIR &&&#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> &&</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> &&</xsl:text>
+    </xsl:if>
+    <xsl:text>&#xA;</xsl:text>
   </xsl:template>
 
   <xsl:template match="replaceable">




More information about the alfs-log mailing list