Changeset b9c5dc9 for BLFS

Timestamp:

02/29/2012 01:16:50 PM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

63e068c

Parents:

9d0e0eb

Message:

Change the code for downloading patches in scripts.xsl
Correct the ftp server usage whan downloading non package files

File:

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

BLFS/xsl/scripts.xsl

@@ -221 +221 @@
             <xsl:value-of select="substring-before($sub-url,'?')"/>
           </xsl:when>
-<!-- Should never happen
-          <xsl:when test="contains($sub-url,'.patch')"/> -->
           <xsl:otherwise>
             <xsl:value-of select="$sub-url"/>
@@ -322 +320 @@
     <xsl:choose>
       <xsl:when test="contains(string(ulink/@url),'.patch')">
+        <xsl:variable name="patch">
+          <xsl:call-template name="package_name">
+            <xsl:with-param name="url" select="ulink/@url"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:text>PATCH=</xsl:text>
+        <xsl:value-of select="$patch"/>
+        <xsl:text>&#xA;if [[ ! -f $PATCH ]] ; then&#xA;</xsl:text>
+         <!-- SRC_ARCHIVE may have subdirectories or not -->
+        <xsl:text>  if [[ -f $SRC_ARCHIVE/$PKG_DIR/$PATCH ]] ; then&#xA;</xsl:text>
+        <xsl:text>    cp $SRC_ARCHIVE/$PKG_DIR/$PATCH $PATCH&#xA;</xsl:text>
+        <xsl:text>  elif [[ -f $SRC_ARCHIVE/$PATCH ]] ; then&#xA;</xsl:text>
+        <xsl:text>    cp $SRC_ARCHIVE/$PATCH $PATCH&#xA;  else&#xA;</xsl:text>
         <xsl:text>wget -T 30 -t 5 </xsl:text>
         <xsl:value-of select="ulink/@url"/>
         <xsl:text>&#xA;</xsl:text>
+        <xsl:text>&#xA;  fi&#xA;fi&#xA;</xsl:text>
       </xsl:when>
       <xsl:when test="ulink">
@@ -347 +359 @@
           <xsl:text>    cp $SRC_ARCHIVE/$PACKAGE1 $PACKAGE1&#xA;  else&#xA;</xsl:text>
           <!-- The FTP_SERVER mirror -->
-          <xsl:text>    wget -T 30 -t 5 ${FTP_SERVER}blfs/svn/</xsl:text>
+          <xsl:text>    wget -T 30 -t 5 ${FTP_SERVER}svn/</xsl:text>
           <xsl:value-of select="$first_letter"/>
           <xsl:text>/$PACKAGE1</xsl:text>