Author: pierre
Date: Fri Aug 26 00:13:09 2016
New Revision: 3875
Log:
Fixes for BLFS porg:
- add a special case for cacerts in packInstall.sh, so that a dummy version
is generated, otherwise porgball does not work as intended
- do not quote out apostrophes in scripts, when generating configuration
instructions
Modified:
jhalfs/branches/new_features/BLFS/xsl/scripts.xsl
jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg
Modified: jhalfs/branches/new_features/BLFS/xsl/scripts.xsl
==============================================================================
--- jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Thu Aug 25 03:04:30
2016 (r3874)
+++ jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Fri Aug 26 00:13:09
2016 (r3875)
@@ -537,7 +537,8 @@
</xsl:call-template>
</xsl:when>
<xsl:when test="contains($out-string,string($APOS))
- and $wrap-install = 'y'">
+ and $wrap-install = 'y'
+ and ancestor::sect2[@role='installation']">
<xsl:call-template name="output-root">
<xsl:with-param name="out-string"
select="substring-before($out-string,string($APOS))"/>
Modified: jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg
==============================================================================
--- jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg Thu Aug 25
03:04:30 2016 (r3874)
+++ jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg Fri Aug 26
00:13:09 2016 (r3875)
@@ -23,6 +23,7 @@
vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed
's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;
tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
docbook-xml) local VERSION=4.5 ;;
+ cacerts*) local VERSION=0.1 ;;
*) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
sed 's/_/./g');;
# the last sed above is because some package managers do not want a '_'
@@ -50,6 +51,7 @@
vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed
's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;
tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
docbook-xml) local VERSION=4.5 ;;
+ cacerts*) local VERSION=0.1 ;;
*) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
sed 's/_/./g');;
# the last sed above is because some package managers do not want a '_'
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
