zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for BLFS porg:

Browse source 
- 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
This commit is contained in:
Pierre Labastie 2016-08-26 07:13:09 +00:00
parent 7bbcce3ce7
commit 24e2a6f2f8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BLFS/xsl/scripts.xsl
View file

@ -537,7 +537,8 @@ popd</xsl:text>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:when test="contains($out-string,string($APOS)) <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:call-template name="output-root">
<xsl:with-param name="out-string" <xsl:with-param name="out-string"
select="substring-before($out-string,string($APOS))"/> select="substring-before($out-string,string($APOS))"/>

2
pkgmngt/packInstall.sh.porg
View file

@ -23,6 +23,7 @@ case $PCKGVRS in
vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;; 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/') ;; tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
docbook-xml) local VERSION=4.5 ;; docbook-xml) local VERSION=4.5 ;;
cacerts*) local VERSION=0.1 ;;
*) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' | *) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
sed 's/_/./g');; sed 's/_/./g');;
# the last sed above is because some package managers do not want a '_' # the last sed above is because some package managers do not want a '_'
@ -50,6 +51,7 @@ case $PCKGVRS in
vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;; 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/') ;; tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
docbook-xml) local VERSION=4.5 ;; docbook-xml) local VERSION=4.5 ;;
cacerts*) local VERSION=0.1 ;;
*) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' | *) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
sed 's/_/./g');; sed 's/_/./g');;
# the last sed above is because some package managers do not want a '_' # the last sed above is because some package managers do not want a '_'