Changeset 540e0c6

Timestamp:

11/28/2005 08:17:49 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

c506b99

Parents:

d419098

Message:

Replaced the xsl:param "unpackdir" by the shell envar "$UNPACKDIR"

File:

• dump-blfs-scripts.xsl (modified) (6 diffs)

dump-blfs-scripts.xsl

@@ -30 +30 @@
       <xsl:param name="package" select="sect1info/keywordset/keyword[@role='package']"/>
       <xsl:param name="ftpdir" select="sect1info/keywordset/keyword[@role='ftpdir']"/>
-      <xsl:param name="unpackdir" select="sect1info/keywordset/keyword[@role='unpackdir']"/>
         <!-- Creating dirs and files -->
       <exsl:document href="{$dirname}/{$filename}" method="text">
@@ -37 +36 @@
           <xsl:with-param name="package" select="$package"/>
           <xsl:with-param name="ftpdir" select="$ftpdir"/>
-          <xsl:with-param name="unpackdir" select="$unpackdir"/>
         </xsl:apply-templates>
         <xsl:if test="sect2[@role='package']">
           <xsl:text>cd ~/sources/</xsl:text>
           <xsl:value-of select="$ftpdir"/>
-          <xsl:text>&#xA;rm -rf </xsl:text>
-          <xsl:value-of select="$unpackdir"/>
-          <xsl:text>&#xA;&#xA;</xsl:text>
+          <xsl:text>&#xA;rm -rf $UNPACKDIR&#xA;&#xA;</xsl:text>
         </xsl:if>
         <xsl:text>exit</xsl:text>
@@ -54 +50 @@
     <xsl:param name="package" select="foo"/>
     <xsl:param name="ftpdir" select="foo"/>
-    <xsl:param name="unpackdir" select="foo"/>
     <xsl:choose>
       <xsl:when test="@role = 'package'">
@@ -67 +62 @@
           <xsl:with-param name="package" select="$package"/>
           <xsl:with-param name="ftpdir" select="$ftpdir"/>
-          <xsl:with-param name="unpackdir" select="$unpackdir"/>
         </xsl:apply-templates>
         <xsl:text>&#xA;</xsl:text>
@@ -74 +68 @@
         <xsl:text>tar -xf </xsl:text>
         <xsl:value-of select="$package"/>
-        <xsl:text>.*&#xA;cd </xsl:text>
-        <xsl:value-of select="$unpackdir"/>
-        <xsl:text>&#xA;</xsl:text>
+        <xsl:text>.* > /tmp/unpacked&#xA;</xsl:text>
+        <xsl:text>UNPACKDIR=`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'`&#xA;</xsl:text>
+        <xsl:text>cd $UNPACKDIR&#xA;</xsl:text>
         <xsl:apply-templates select=".//screen | .//para/command"/>
         <xsl:text>&#xA;</xsl:text>
@@ -117 +111 @@
     <xsl:param name="package" select="foo"/>
     <xsl:param name="ftpdir" select="foo"/>
-    <xsl:param name="unpackdir" select="foo"/>
     <xsl:choose>
       <xsl:when test="contains(string(),'HTTP')">