[jhalfs] 06/06: Refactor automation instructions

This is a multi-part message in MIME format...

------------=_1777575227-14467-27477
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

commit c24973a0de73d864293fb86c81dbbf3af97b9713
Author: Pierre Labastie <[email protected]>
AuthorDate: Thu Apr 30 20:52:09 2026 +0200

    Refactor automation instructions
---
 BLFS/xsl/scripts.xsl | 61 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index bc81f38..03cbf0d 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -1078,34 +1078,49 @@ pip3 install -I --no-deps --root $PKG_DEST</xsl:text>
                                                   '&amp;&amp;&#xA;')"/>
         </xsl:call-template>
       </xsl:when>
-      <xsl:otherwise>
+      <!-- from now on, out-string contains only one line, possibly
+      with a continuation character. We have several special
+      cases which are convenient to treat here -->
+      <!-- We need to insert passwords in tripwire instructions -->
+      <xsl:when test="contains($out-string,'twadmin')">
+        <xsl:text>twadmin --create-polfile -Q spw</xsl:text>
+        <xsl:copy-of select="substring-after($out-string,'polfile')"/>
+      </xsl:when>
+      <xsl:when test="contains($out-string,'tripwire')">
         <xsl:copy-of select="$out-string"/>
-        <!-- there are a few cases where we want to add some time after
-             our instruction, because it starts a program in background. Let's
-             do it here. -->
-        <xsl:if test="contains($out-string,'/data/logfile') or
+        <xsl:text> -P lpw</xsl:text>
+      </xsl:when>
+      <!-- there are a few cases where we want to add some time after
+           our instruction, because it starts a program in background. Let's
+           do it here. -->
+      <xsl:when test="contains($out-string,'/data/logfile') or
                       contains($out-string,'mariadbd-safe') or
                       contains($out-string,'start named')">
-          <xsl:text>
+        <xsl:copy-of select="$out-string"/>
+        <xsl:text>
 sleep 5</xsl:text>
-        </xsl:if>
-        <!-- we need to add a password for mariadb, otherwise the script
-             stops waiting for it. We also need to provide it to stop
-             the database. -->
-        <xsl:if test="contains($out-string,'root password')">
-          <xsl:text> mdbpw</xsl:text>
-        </xsl:if>
-        <xsl:if test="contains($out-string,'-p shutdown')">
-          <xsl:text> &lt;&lt; PW_EOF
-mdbpw
-PW_EOF</xsl:text>
-        </xsl:if>
-        <!-- prevent gcc tests to stop the build if failing (which
-             is more than likely). -->
-        <xsl:if test="ancestor::sect1[@id='gcc'] and
+      </xsl:when>
+      <!-- we need to add a password for mariadb, otherwise the script
+           stops waiting for it. We also need to provide it to stop
+           the database. -->
+      <xsl:when test="contains($out-string,'root password')">
+        <xsl:copy-of select="$out-string"/>
+        <xsl:text> mdbpw</xsl:text>
+      </xsl:when>
+      <xsl:when test="contains($out-string,'-p shutdown')">
+        <xsl:copy-of select="substring-before($out-string,'-p')"/>
+        <xsl:text>-pmdbpw</xsl:text>
+        <xsl:copy-of select="substring-after($out-string,'-p')"/>
+      </xsl:when>
+      <!-- prevent gcc tests to stop the build if failing (which
+           is more than likely). -->
+      <xsl:when test="ancestor::sect1[@id='gcc'] and
                       contains($out-string,'check')">
-          <xsl:text> || true</xsl:text>
-        </xsl:if>
+        <xsl:copy-of select="$out-string"/>
+        <xsl:text> || true</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$out-string"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

------------=_1777575227-14467-27477
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page
------------=_1777575227-14467-27477--