Changes in BLFS/xsl/scripts.xsl [05b955b:a6c57de]

File:

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

BLFS/xsl/scripts.xsl

@@ -80 +80 @@
 <!-- include the template for replaceable tags -->
   <xsl:include href="process-replaceable.xsl"/>
+
+<!-- include the template for prompt tags -->
+  <xsl:include href="process-prompt.xsl"/>
 
 <!--=================== Begin processing ========================-->
@@ -303 +306 @@
       </xsl:when><!-- @role="package" -->
 
-      <xsl:when test="@role = 'qt5-prefix' or @role = 'qt6-prefix'">
+      <xsl:when test="@role = 'qt4-prefix' or @role = 'qt5-prefix'">
         <xsl:apply-templates select=".//screen[./userinput]"/>
       </xsl:when>
@@ -386 +389 @@
       <xsl:when test="@role = 'configuration'">
         <xsl:text>&#xA;</xsl:text>
-        <xsl:apply-templates mode="config"
-             select=".//screen[not(@role = 'nodump') and ./userinput]"/>
+        <xsl:choose>
+          <xsl:when test=".//screen/userinput/prompt">
+            <xsl:call-template name="process-prompt">
+              <xsl:with-param
+                name="instructions"
+                select=".//screen[not(@role = 'nodump') and ./userinput]"/>
+              <xsl:with-param name="root-seen" select="false"/>
+              <xsl:with-param name="prompt-seen" select="false"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates mode="config"
+                 select=".//screen[not(@role = 'nodump') and ./userinput]"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:when><!-- @role="configuration" -->
 
@@ -442 +458 @@
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="first_letter"
+                  select="translate(substring($package,1,1),
+                                    'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+                                    'abcdefghijklmnopqrstuvwxyz')"/>
     <xsl:text>&#xA;</xsl:text>
     <xsl:value-of select="$varname"/>
@@ -457 +477 @@
     <xsl:value-of select="$varname"/>
     <xsl:text>"
-  else<!-- Download from upstream http -->
-    wget -T 30 -t 5 "</xsl:text>
-    <xsl:value-of select="$httpurl"/>
+  else&#xA;</xsl:text>
+    <!-- Download from upstream http -->
+    <xsl:if test="string-length($httpurl) &gt; 10">
+      <xsl:text>    wget -T 30 -t 5 "</xsl:text>
+      <xsl:value-of select="$httpurl"/>
+      <xsl:text>" ||&#xA;</xsl:text>
+    </xsl:if>
+    <!-- Download from upstream ftp -->
+    <xsl:if test="string-length($ftpurl) &gt; 10">
+      <xsl:text>    wget -T 30 -t 5 "</xsl:text>
+      <xsl:value-of select="$ftpurl"/>
+      <xsl:text>" ||&#xA;</xsl:text>
+    </xsl:if>
+    <!-- The FTP_SERVER mirror as a last resort -->
+    <xsl:text>    wget -T 30 -t 5 "${JH_FTP_SERVER}svn/</xsl:text>
+    <xsl:value-of select="$first_letter"/>
+    <xsl:text>/$</xsl:text>
+    <xsl:value-of select="$varname"/>
     <xsl:text>"
   fi