Changeset 24ad4fd for BLFS/xsl

Timestamp:

03/18/2023 09:44:03 PM (16 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

6ac0d96

Parents:

5126ee3

Message:

Fix outputting too many sh <<ROOT_EOF

When installing a bootscript or a unit, this sometimes happen
(e.g. samba).

File:

• BLFS/xsl/scripts.xsl (modified) (6 diffs)

BLFS/xsl/scripts.xsl

@@ -723 +723 @@
     <xsl:if test="preceding-sibling::para[1]/xref[@linkend='bootscripts']">
 <!-- if the preceding "screen" tag is role="root", and we are role="root"
-     the end-root has not been called. So do it -->
+     the end-root has not been called, except if the preceding "screen"
+     tag is itself preceded by a <para> containing and <xref> to
+     bootscripts. So close it only if needed -->
       <xsl:if
-           test="preceding-sibling::screen[1][@role='root'] and @role='root'">
+        test="preceding-sibling::screen[1][@role='root'] and
+        @role='root' and
+        not(preceding-sibling::screen[1]/preceding-sibling::para[1]/xref[@linkend='bootscripts'])">
         <xsl:call-template name="end-root"/>
       </xsl:if>
@@ -734 +738 @@
       </xsl:call-template>
 <!-- if the preceding "screen" tag is role="root", and we are role="root"
-     the begin-root will not be called. So do it -->
+     the begin-root will not be called. So do it.-->
       <xsl:if
-           test="preceding-sibling::screen[1][@role='root'] and @role='root'">
+        test="preceding-sibling::screen[1][@role='root'] and
+        @role='root'">
         <xsl:call-template name="begin-root"/>
       </xsl:if>
@@ -742 +747 @@
     <xsl:if test="preceding-sibling::para[1]/xref[@linkend='systemd-units']">
 <!-- if the preceding "screen" tag is role="root", and we are role="root"
-     the end-root has not been called. So do it -->
+     the end-root has not been called. So do it, except if it was already a
+     unit install -->
       <xsl:if
-           test="preceding-sibling::screen[1][@role='root'] and @role='root'">
+        test="preceding-sibling::screen[1][@role='root'] and
+        @role='root' and
+        not(preceding-sibling::screen[1]/preceding-sibling::para[1]/xref[@linkend='systemd-units'])">
         <xsl:call-template name="end-root"/>
       </xsl:if>
@@ -753 +761 @@
       </xsl:call-template>
 <!-- if the preceding "screen" tag is role="root", and we are role="root"
-     the begin-root will not be called. So do it -->
+     the begin-root will not be called. So do it. -->
       <xsl:if
-           test="preceding-sibling::screen[1][@role='root'] and @role='root'">
+        test="preceding-sibling::screen[1][@role='root'] and
+        @role='root'">
         <xsl:call-template name="begin-root"/>
       </xsl:if>
@@ -763 +772 @@
                                                   @linkend='systemd-units']">
 <!-- if the next "screen" tag is role="root", and we are role="root"
-     the end-root has not been called. So do it -->
+     the end-root has not been called. -->
       <xsl:if
            test="following-sibling::screen[1][@role='root'] and @role='root'">
@@ -771 +780 @@
 popd</xsl:text>
 <!-- if the next "screen" tag is role="root", and we are role="root"
-     the begin-root will not be called. So do it -->
+     the begin-root will not be called. So do it, except if the next
+     <screen> is itself a unit or bootscript install -->
       <xsl:if
-           test="following-sibling::screen[1][@role='root'] and @role='root'">
+        test="following-sibling::screen[1][@role='root'] and
+        @role='root' and
+        not(following-sibling::screen[1]/preceding-sibling::para[1]/xref[@linkend='bootscripts' or @linkend='systemd-units'])">
         <xsl:call-template name="begin-root"/>
       </xsl:if>