BLFS: Fixed a bug on the previous commit.
This commit is contained in:
parent
a70c289526
commit
1caf1f4fbe
1 changed files with 14 additions and 14 deletions
|
@ -185,18 +185,18 @@ FTP_SERVER=$FTP_SERVER
</xsl:text>
|
||||||
<xsl:text>mkdir -p ${section}
cd ${section}
</xsl:text>
|
<xsl:text>mkdir -p ${section}
cd ${section}
</xsl:text>
|
||||||
<xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
|
<xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
|
||||||
<xsl:text>for line in $(grep -v '^#' ../${sect-ver}.wget) ; do
|
<xsl:text>for line in $(grep -v '^#' ../${sect-ver}.wget) ; do
|
||||||
if [[ ! -f $line ]] ; then
|
if [[ ! -f ${line} ]] ; then
|
||||||
if [[ -f $SRC_ARCHIVE/Xorg/$section/$line ]] ; then
|
if [[ -f $SRC_ARCHIVE/Xorg/${section}/${line} ]] ; then
|
||||||
cp $SRC_ARCHIVE/Xorg/$section/$line $line
|
cp $SRC_ARCHIVE/Xorg/${section}/${line} ${line}
|
||||||
elif [[ -f $SRC_ARCHIVE/Xorg/$line ]] ; then
|
elif [[ -f $SRC_ARCHIVE/Xorg/${line} ]] ; then
|
||||||
cp $SRC_ARCHIVE/Xorg/$line $line
|
cp $SRC_ARCHIVE/Xorg/${line} ${line}
|
||||||
elif [[ -f $SRC_ARCHIVE/$section/$line ]] ; then
|
elif [[ -f $SRC_ARCHIVE/${section}/${line} ]] ; then
|
||||||
cp $SRC_ARCHIVE/$section/$line $line
|
cp $SRC_ARCHIVE/${section}/${line} ${line}
|
||||||
elif [[ -f $SRC_ARCHIVE/$line ]] ; then
|
elif [[ -f $SRC_ARCHIVE/${line} ]] ; then
|
||||||
cp $SRC_ARCHIVE/$line $line
|
cp $SRC_ARCHIVE/${line} ${line}
|
||||||
else
|
else
|
||||||
wget ${FTP_SERVER}conglomeration/Xorg/$line || \
|
wget ${FTP_SERVER}conglomeration/Xorg/${line} || \
|
||||||
wget http://xorg.freedesktop.org/releases/individual/util/$line
|
wget http://xorg.freedesktop.org/releases/individual/${section}/${line}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -207,11 +207,11 @@ cp ../${sect-ver}.md5 ../${sect-ver}.md5.orig
</xsl:text>
|
||||||
<xsl:when test="@role = 'installation'">
|
<xsl:when test="@role = 'installation'">
|
||||||
<xsl:text>for package in $(grep -v '^#' ../${sect-ver}.wget) ; do
|
<xsl:text>for package in $(grep -v '^#' ../${sect-ver}.wget) ; do
|
||||||
packagedir=$(echo $package | sed 's/.tar.bz2//')
|
packagedir=$(echo $package | sed 's/.tar.bz2//')
|
||||||
tar -xf $package
|
tar -xf ${package}
|
||||||
cd $packagedir
</xsl:text>
|
cd ${packagedir}
</xsl:text>
|
||||||
<xsl:apply-templates select=".//screen | .//para/command"/>
|
<xsl:apply-templates select=".//screen | .//para/command"/>
|
||||||
<xsl:text> cd ..
|
<xsl:text> cd ..
|
||||||
rm -rf $packagedir
|
rm -rf ${packagedir}
|
||||||
sed -i "/${package}/d" ../${sect-ver}.wget
|
sed -i "/${package}/d" ../${sect-ver}.wget
|
||||||
sed -i "/${package}/d" ../${sect-ver}.md5
|
sed -i "/${package}/d" ../${sect-ver}.md5
|
||||||
done
|
done
|
||||||
|
|
Reference in a new issue