* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2008-09-22 13:43 Diego Petteno (flameeyes)
0 siblings, 0 replies; 18+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-09-22 13:43 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/09/22 13:43:02
Modified: build-docbook-catalog
Log:
Extend build-docbook-catalog to support different types of xsl stylesheets (which include xsl-ns for Docbook 5).
Be ready to support xsl-xalan and xsl-saxon even if they are not
available in Portage too.
Also, assume that the directories are unversioned, as the new ebuilds
don't version them anymore.
The script could be deprecated, for what concerns XSL stylesheets, by
using an eclass instead.
Revision Changes Path
1.3 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.2&r2=1.3
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-docbook-catalog 22 Jul 2004 22:35:18 -0000 1.2
+++ build-docbook-catalog 22 Sep 2008 13:43:02 -0000 1.3
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.2 2004/07/22 22:35:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.3 2008/09/22 13:43:02 flameeyes Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -35,7 +35,9 @@
done
create_catalogs # will exit on error
- populate_xsl
+ for type in xsl xsl-ns xsl-saxon xsl-xalan; do
+ populate_xsl $type
+ done
# Clean out old dtds from catalog
verb "Cleaning out old DocBook XML versions from ${CATALOG} and ${ROOTCATALOG}"
@@ -251,32 +253,36 @@
populate_xsl() {
typeset listed avail f
- # Delete current entries from the catalog
- clean_catalog "${DOCBOOKDIR}/xsl-stylesheets-[0-9\.]+" $CATALOG
- clean_catalog "${DOCBOOKDIR}/xsl-stylesheets-[0-9\.]+" $ROOTCATALOG
-
- # Find the available XSL stylesheets. In theory there should only
- # be one match since these aren't slotted, but restrict to the
- # first match anyway...
- avail=$(find ${DOCBOOKDIR%/*} -name chunk.xsl | head -n 1)
- if [[ -z ${avail} ]]; then
- echo "Could not locate chunk.xsl of DocBook XSL stylesheets" >&2
+ # This is either xsl, xsl-ns, xsl-saxon or xsl-xalan
+ local type=$1
+
+ # Delete current entries from the catalog (delete legacy versioned entries too)
+ clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" $CATALOG
+ clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" $ROOTCATALOG
+
+ xsldir=/usr/share/sgml/docbook/${type}-stylesheets
+
+ if [[ ! -d ${xsldir} ]]; then
+ echo "DocBook XSL stylesheets (${type}) not found" >&2
return 1
fi
- xsldir=${avail%/*/*}
+
if [[ ! -e ${xsldir}/html/docbook.xsl || ! -e ${xsldir}/common/l10n.xml ]]; then
- echo "DocBook XSLT stylesheets are missing files from ${xsldir}" >&2
+ echo "DocBook XSL stylesheets are missing files from ${xsldir}" >&2
return 1
fi
# Populate catalog with XSL entries
- echo "Found DocBook XSL stylesheets in ${xsldir}"
+ echo "Found DocBook XSL stylesheets (${type}) in ${xsldir}"
verb " Populating ${CATALOG} with XSL stylesheets"
+
+ # HACK: This is a totally arbitrary subset, either it should
+ # be reduced to just current or it should be expanded.
for version in current 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \
- 1.48 1.49 1.50 ${xsldir##*-}
+ 1.48 1.49 1.50
do
- xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/${version}" "file://${xsldir}" ${CATALOG}
- xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/xsl/${version}" "file://${xsldir}" ${CATALOG}
+ xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/${version}" "file://${xsldir}" ${CATALOG}
+ xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/${version}" "file://${xsldir}" ${CATALOG}
done
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2008-09-22 14:10 Diego Petteno (flameeyes)
0 siblings, 0 replies; 18+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-09-22 14:10 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/09/22 14:10:17
Modified: build-docbook-catalog
Log:
Fix support for other XSL types by further delegating the catalogs.
Revision Changes Path
1.4 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.3&r2=1.4
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-docbook-catalog 22 Sep 2008 13:43:02 -0000 1.3
+++ build-docbook-catalog 22 Sep 2008 14:10:17 -0000 1.4
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.3 2008/09/22 13:43:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.4 2008/09/22 14:10:17 flameeyes Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -109,8 +109,6 @@
xmlcatalog --noout --add "delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/xsl/" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/xsl/" "file://${CATALOG}" ${ROOTCATALOG}
# entities pointer
verb " Populating ${ROOTCATALOG} with ISO entities delegate to ${CATALOG}"
@@ -274,16 +272,14 @@
# Populate catalog with XSL entries
echo "Found DocBook XSL stylesheets (${type}) in ${xsldir}"
- verb " Populating ${CATALOG} with XSL stylesheets"
- # HACK: This is a totally arbitrary subset, either it should
- # be reduced to just current or it should be expanded.
- for version in current 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \
- 1.48 1.49 1.50
- do
- xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/${version}" "file://${xsldir}" ${CATALOG}
- xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/${version}" "file://${xsldir}" ${CATALOG}
- done
+ verb " Populating ${ROOTCATALOG} with XSL delegations"
+ xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG}
+ xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG}
+
+ verb " Populating ${CATALOG} with XSL stylesheets"
+ xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG}
+ xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG}
}
# Call the main routine
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2009-08-23 16:06 Diego Petteno (flameeyes)
0 siblings, 0 replies; 18+ messages in thread
From: Diego Petteno (flameeyes) @ 2009-08-23 16:06 UTC (permalink / raw
To: gentoo-commits
flameeyes 09/08/23 16:06:03
Modified: build-docbook-catalog
Log:
Improve support for local resolver, patch by Jiri Tyr in bug #194485.
Revision Changes Path
1.5 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.4&r2=1.5
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-docbook-catalog 22 Sep 2008 14:10:17 -0000 1.4
+++ build-docbook-catalog 23 Aug 2009 16:06:03 -0000 1.5
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.4 2008/09/22 14:10:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.5 2009/08/23 16:06:03 flameeyes Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -105,8 +105,9 @@
# dtd pointers
verb " Populating ${ROOTCATALOG} with DTD delegates to ${CATALOG}"
- xmlcatalog --noout --add "delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
+ xmlcatalog --noout --add "delegatePublic" "-//OASIS//ENTITIES DocBook" "file://${CATALOG}" ${ROOTCATALOG}
+ xmlcatalog --noout --add "delegatePublic" "-//OASIS//ELEMENTS DocBook" "file://${CATALOG}" ${ROOTCATALOG}
+ xmlcatalog --noout --add "delegatePublic" "-//OASIS//DTD DocBook" "file://${CATALOG}" ${ROOTCATALOG}
xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2011-03-29 2:11 Diego Petteno (flameeyes)
0 siblings, 0 replies; 18+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-03-29 2:11 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/03/29 02:11:48
Modified: build-docbook-catalog
Log:
Add support for simple-dtds, thanks to Yaakov S in bug #290680.
Revision Changes Path
1.6 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.5&r2=1.6
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-docbook-catalog 23 Aug 2009 16:06:03 -0000 1.5
+++ build-docbook-catalog 29 Mar 2011 02:11:48 -0000 1.6
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.5 2009/08/23 16:06:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.6 2011/03/29 02:11:48 flameeyes Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -41,13 +41,16 @@
# Clean out old dtds from catalog
verb "Cleaning out old DocBook XML versions from ${CATALOG} and ${ROOTCATALOG}"
- clean_catalog "${DOCBOOKDIR}/xml-dtd-[^/\"']*/[^/\"']*" ${CATALOG}
- clean_catalog "${DOCBOOKDIR}/xml-dtd-[^/\"']*/[^/\"']*" ${ROOTCATALOG}
+ clean_catalog "${DOCBOOKDIR}/xml\(-simple\)*-dtd-[^/\"']*/[^/\"']*" ${CATALOG}
+ clean_catalog "${DOCBOOKDIR}/xml\(-simple\)*-dtd-[^/\"']*/[^/\"']*" ${ROOTCATALOG}
if set_dtds; then
for d in ${DTDS}; do
populate_dtd ${d}
done
+ for d in ${SIMPLE_DTDS}; do
+ populate_simple_dtd ${d}
+ done
populate_entities
fi
@@ -66,6 +69,7 @@
#
set_dtds() {
DTDS=$(find ${DOCBOOKDIR} -path '*/xml-dtd-*/docbookx.dtd')
+ SIMPLE_DTDS=$(find ${DOCBOOKDIR} -path '*/xml-simple-dtd-*/sdocbook.dtd')
if [[ -z ${DTDS} ]]; then
echo "No installed DocBook XML DTDs found"
return 1
@@ -177,6 +181,28 @@
fi
}
+#
+# populate a specific simple dtd version into the docbook catalog
+# $1 == /path/to/sdocbook.dtd
+#
+populate_simple_dtd() {
+ typeset dtd=$1 docbookdir=${1%/*}
+ typeset v=${docbookdir##*-}
+
+ # sanity check
+ if [[ ${dtd} != */xml-simple-dtd-*/* ]]; then
+ echo "Warning: I don't understand \"${dtd}\"" >&2
+ return
+ fi
+ echo "Found Simplified DocBook XML ${v} in ${docbookdir}"
+
+ # Populate the docbook catalog with this version
+ verb " Populating ${CATALOG} based on ${docbookdir}"
+ xmlcatalog --noout --add "public" "-//OASIS//DTD Simplified DocBook XML V${v}//EN" "file://${docbookdir}/sdocbook.dtd" ${CATALOG}
+ xmlcatalog --noout --add "rewriteSystem" "http://www.oasis-open.org/docbook/xml/simple/${v}" "file://${docbookdir}" ${CATALOG}
+ xmlcatalog --noout --add "rewriteURI" "http://www.oasis-open.org/docbook/xml/simple/${v}" "file://${docbookdir}" ${CATALOG}
+}
+
#
# populate ISO DocBook entities from the most recent DTD
#
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2011-11-01 21:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-01 21:04 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/01 21:04:00
Modified: build-docbook-catalog
Log:
eat trailing whitespace
Revision Changes Path
1.7 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.6&r2=1.7
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-docbook-catalog 29 Mar 2011 02:11:48 -0000 1.6
+++ build-docbook-catalog 1 Nov 2011 21:04:00 -0000 1.7
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.6 2011/03/29 02:11:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.7 2011/11/01 21:04:00 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -57,7 +57,7 @@
exit 0
}
-#
+#
# verbose echo -- only echo if called with --verbose
#
verb() {
@@ -66,7 +66,7 @@
#
# fill in the DTDS variable based on installed versions
-#
+#
set_dtds() {
DTDS=$(find ${DOCBOOKDIR} -path '*/xml-dtd-*/docbookx.dtd')
SIMPLE_DTDS=$(find ${DOCBOOKDIR} -path '*/xml-simple-dtd-*/sdocbook.dtd')
@@ -134,7 +134,7 @@
done
}
-#
+#
# populate a specific dtd version into the docbook catalog
# $1 == /path/to/docbookx.dtd
#
@@ -181,7 +181,7 @@
fi
}
-#
+#
# populate a specific simple dtd version into the docbook catalog
# $1 == /path/to/sdocbook.dtd
#
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 21:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 21:23 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 21:23:00
Modified: build-docbook-catalog
Log:
add an error() helper
Revision Changes Path
1.8 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.7&r2=1.8
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-docbook-catalog 1 Nov 2011 21:04:00 -0000 1.7
+++ build-docbook-catalog 27 Mar 2012 21:23:00 -0000 1.8
@@ -1,10 +1,10 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.7 2011/11/01 21:04:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.8 2012/03/27 21:23:00 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
#
-# Copyright 2004 Gentoo Foundation
+# Copyright 2004-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# written by Aron Griffis
#
@@ -30,7 +30,7 @@
case "$1" in
-v|--verbose) VERBOSE=true ; shift ;;
--) shift ; break ;;
- *) echo "Options parsing failed on $1!" >&2 ; exit 1 ;;
+ *) error "options parsing failed on $1!" ;;
esac
done
@@ -65,6 +65,14 @@
}
#
+# show an error and abort
+#
+error() {
+ printf '%s: %b, aborting\n' "${ZERO}" "$*" 1>&2
+ exit 1
+}
+
+#
# fill in the DTDS variable based on installed versions
#
set_dtds() {
@@ -86,8 +94,7 @@
echo "Creating XML Catalog root ${ROOTCATALOG}"
/usr/bin/xmlcatalog --noout --create ${ROOTCATALOG}
if [[ ! -r ${ROOTCATALOG} ]] ; then
- echo "Failed creating ${ROOTCATALOG}, aborting" >&2
- exit 1
+ error "failed creating ${ROOTCATALOG}"
fi
else
verb "Found XML Catalog root ${ROOTCATALOG}"
@@ -100,8 +107,7 @@
echo "Creating DocBook XML Catalog ${CATALOG}"
/usr/bin/xmlcatalog --noout --create ${CATALOG}
if [[ ! -r ${CATALOG} ]] ; then
- echo "Failed creating ${CATALOG}, aborting" >&2
- exit 1
+ error "failed creating ${CATALOG}"
fi
else
verb "Found DocBook XML Catalog ${CATALOG}"
@@ -266,8 +272,7 @@
let j=j+1
let i=i+2
else
- echo "${0}: Whoah, shouldn't be here, aborting" >&2
- exit 1
+ error "${0}: whoah, shouldn't be here"
fi
done
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 21:28 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 21:28 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 21:28:18
Modified: build-docbook-catalog
Log:
add -h/--help options
Revision Changes Path
1.9 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.8&r2=1.9
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-docbook-catalog 27 Mar 2012 21:23:00 -0000 1.8
+++ build-docbook-catalog 27 Mar 2012 21:28:18 -0000 1.9
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.8 2012/03/27 21:23:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.9 2012/03/27 21:28:18 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -19,19 +19,36 @@
ZERO=${0##*/}
#
+# usage!
+#
+usage() {
+ cat <<-EOF
+ Usage: ${ZERO} [options]
+
+ Options:
+ -v, --verbose Be verbose
+ -h, --help This!
+ EOF
+ [[ $# -gt 0 ]] && eerror "$*"
+ exit 0
+}
+
+#
# main (called from bottom)
#
main() {
typeset d v opts
- opts=$(getopt -o v --long verbose -n "$ZERO" -- "$@") || exit 1
+ opts=$(getopt -o hv --long help,verbose -n "$ZERO" -- "$@") || exit 1
eval set -- "$opts"
while true; do
case "$1" in
- -v|--verbose) VERBOSE=true ; shift ;;
- --) shift ; break ;;
- *) error "options parsing failed on $1!" ;;
+ -h|--help) usage ;;
+ -v|--verbose) VERBOSE=true ;;
+ --) break ;;
+ *) usage "options parsing failed on $1!" ;;
esac
+ shift
done
create_catalogs # will exit on error
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 22:39 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 22:39 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 22:39:03
Modified: build-docbook-catalog
Log:
use `local` rather than `typeset` to better match current Gentoo style
Revision Changes Path
1.10 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.9&r2=1.10
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build-docbook-catalog 27 Mar 2012 21:28:18 -0000 1.9
+++ build-docbook-catalog 27 Mar 2012 22:39:03 -0000 1.10
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.9 2012/03/27 21:28:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.10 2012/03/27 22:39:03 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -37,7 +37,7 @@
# main (called from bottom)
#
main() {
- typeset d v opts
+ local d v opts
opts=$(getopt -o hv --long help,verbose -n "$ZERO" -- "$@") || exit 1
eval set -- "$opts"
@@ -149,7 +149,7 @@
# $2 == catalog
#
clean_catalog() {
- typeset list f regex=$1 catalog=$2
+ local list f regex=$1 catalog=$2
list=$(egrep --only-matching "${regex}" "${catalog}" | sort -u)
for f in ${list}; do
@@ -162,8 +162,8 @@
# $1 == /path/to/docbookx.dtd
#
populate_dtd() {
- typeset dtd=$1 docbookdir=${1%/*} dtd_date
- typeset v=${docbookdir##*-}
+ local dtd=$1 docbookdir=${1%/*} dtd_date
+ local v=${docbookdir##*-}
# sanity check
if [[ ${dtd} != */xml-dtd-*/* ]]; then
@@ -209,8 +209,8 @@
# $1 == /path/to/sdocbook.dtd
#
populate_simple_dtd() {
- typeset dtd=$1 docbookdir=${1%/*}
- typeset v=${docbookdir##*-}
+ local dtd=$1 docbookdir=${1%/*}
+ local v=${docbookdir##*-}
# sanity check
if [[ ${dtd} != */xml-simple-dtd-*/* ]]; then
@@ -230,8 +230,8 @@
# populate ISO DocBook entities from the most recent DTD
#
populate_entities() {
- typeset isodir=${LATEST_DTD%/*}/ent i j
- typeset -a entities avail
+ local isodir=${LATEST_DTD%/*}/ent i j
+ local entities=() avail=()
# sanity check
if [[ -z ${LATEST_DTD} || ! -d ${isodir} ]]; then
@@ -298,7 +298,7 @@
# populate XSL stylesheets
#
populate_xsl() {
- typeset listed avail f
+ local f
# This is either xsl, xsl-ns, xsl-saxon or xsl-xalan
local type=$1
@@ -307,7 +307,7 @@
clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" $CATALOG
clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" $ROOTCATALOG
- xsldir=/usr/share/sgml/docbook/${type}-stylesheets
+ local xsldir=/usr/share/sgml/docbook/${type}-stylesheets
if [[ ! -d ${xsldir} ]]; then
echo "DocBook XSL stylesheets (${type}) not found" >&2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 22:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 22:41 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 22:41:10
Modified: build-docbook-catalog
Log:
check to see if DOCBOOKDIR exists before running `find` to avoid ugly errors with missing dirs
Revision Changes Path
1.11 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.10&r2=1.11
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-docbook-catalog 27 Mar 2012 22:39:03 -0000 1.10
+++ build-docbook-catalog 27 Mar 2012 22:41:10 -0000 1.11
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.10 2012/03/27 22:39:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.11 2012/03/27 22:41:10 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -93,8 +93,13 @@
# fill in the DTDS variable based on installed versions
#
set_dtds() {
- DTDS=$(find ${DOCBOOKDIR} -path '*/xml-dtd-*/docbookx.dtd')
- SIMPLE_DTDS=$(find ${DOCBOOKDIR} -path '*/xml-simple-dtd-*/sdocbook.dtd')
+ DTDS= SIMPLE_DTS=
+
+ if [[ -d ${DOCBOOKDIR} ]] ; then
+ DTDS=$(find ${DOCBOOKDIR} -path '*/xml-dtd-*/docbookx.dtd')
+ SIMPLE_DTDS=$(find ${DOCBOOKDIR} -path '*/xml-simple-dtd-*/sdocbook.dtd')
+ fi
+
if [[ -z ${DTDS} ]]; then
echo "No installed DocBook XML DTDs found"
return 1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 22:44 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 22:44 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 22:44:46
Modified: build-docbook-catalog
Log:
drop hardcoded full paths as there is no need for that -- $PATH works just fine
Revision Changes Path
1.12 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.11&r2=1.12
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-docbook-catalog 27 Mar 2012 22:41:10 -0000 1.11
+++ build-docbook-catalog 27 Mar 2012 22:44:46 -0000 1.12
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.11 2012/03/27 22:41:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.12 2012/03/27 22:44:46 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -114,7 +114,7 @@
create_catalogs() {
if [[ ! -r ${ROOTCATALOG} ]] ; then
echo "Creating XML Catalog root ${ROOTCATALOG}"
- /usr/bin/xmlcatalog --noout --create ${ROOTCATALOG}
+ xmlcatalog --noout --create ${ROOTCATALOG}
if [[ ! -r ${ROOTCATALOG} ]] ; then
error "failed creating ${ROOTCATALOG}"
fi
@@ -127,7 +127,7 @@
if [[ ! -r ${CATALOG} ]] ; then
echo "Creating DocBook XML Catalog ${CATALOG}"
- /usr/bin/xmlcatalog --noout --create ${CATALOG}
+ xmlcatalog --noout --create ${CATALOG}
if [[ ! -r ${CATALOG} ]] ; then
error "failed creating ${CATALOG}"
fi
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 22:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 22:46 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 22:46:32
Modified: build-docbook-catalog
Log:
attempt to create /etc/xml if it does not exist so `rm -rf /etc/xml && build-docbook-catalog` works
Revision Changes Path
1.13 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.12&r2=1.13
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build-docbook-catalog 27 Mar 2012 22:44:46 -0000 1.12
+++ build-docbook-catalog 27 Mar 2012 22:46:32 -0000 1.13
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.12 2012/03/27 22:44:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.13 2012/03/27 22:46:32 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -9,8 +9,9 @@
# written by Aron Griffis
#
-ROOTCATALOG=/etc/xml/catalog
-CATALOG=/etc/xml/docbook
+ROOTCONFDIR=/etc/xml
+ROOTCATALOG=${ROOTCONFDIR}/catalog
+CATALOG=${ROOTCONFDIR}/docbook
DOCBOOKDIR=/usr/share/sgml/docbook
DTDS=
LATEST_DTD=
@@ -112,6 +113,10 @@
# create the catalogs root and docbook specific
#
create_catalogs() {
+ if [[ ! -d ${ROOTCONFDIR} ]] ; then
+ mkdir -p "${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
+ fi
+
if [[ ! -r ${ROOTCATALOG} ]] ; then
echo "Creating XML Catalog root ${ROOTCATALOG}"
xmlcatalog --noout --create ${ROOTCATALOG}
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 22:50 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 22:50 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 22:50:44
Modified: build-docbook-catalog
Log:
add a new multi_xmlcatalog_add helper to simplify logic related to calling `xmlcatalog --noout --add`
Revision Changes Path
1.14 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.13&r2=1.14
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build-docbook-catalog 27 Mar 2012 22:46:32 -0000 1.13
+++ build-docbook-catalog 27 Mar 2012 22:50:44 -0000 1.14
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.13 2012/03/27 22:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.14 2012/03/27 22:50:44 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -110,9 +110,26 @@
}
#
+# multi_xmlcatalog_add <file> <opts array>
+#
+# the opts array is a set of three: what gets passed to --add
+#
+multi_xmlcatalog_add() {
+ local file=$1
+ shift
+
+ while [[ $# -gt 0 ]] ; do
+ xmlcatalog --noout --add "$1" "$2" "file://$3" "${file}"
+ shift 3
+ done
+}
+
+#
# create the catalogs root and docbook specific
#
create_catalogs() {
+ local adds
+
if [[ ! -d ${ROOTCONFDIR} ]] ; then
mkdir -p "${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
fi
@@ -142,15 +159,21 @@
# dtd pointers
verb " Populating ${ROOTCATALOG} with DTD delegates to ${CATALOG}"
- xmlcatalog --noout --add "delegatePublic" "-//OASIS//ENTITIES DocBook" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegatePublic" "-//OASIS//ELEMENTS DocBook" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegatePublic" "-//OASIS//DTD DocBook" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
+ adds=(
+ "delegatePublic" "-//OASIS//ENTITIES DocBook" "${CATALOG}"
+ "delegatePublic" "-//OASIS//ELEMENTS DocBook" "${CATALOG}"
+ "delegatePublic" "-//OASIS//DTD DocBook" "${CATALOG}"
+ "delegateSystem" "http://www.oasis-open.org/docbook/" "${CATALOG}"
+ "delegateURI" "http://www.oasis-open.org/docbook/" "${CATALOG}"
+ )
+ multi_xmlcatalog_add "${ROOTCATALOG}" "${adds[@]}"
# entities pointer
verb " Populating ${ROOTCATALOG} with ISO entities delegate to ${CATALOG}"
- xmlcatalog --noout --add "delegatePublic" "ISO 8879:1986" "file://${CATALOG}" ${ROOTCATALOG}
+ adds=(
+ "delegatePublic" "ISO 8879:1986" "${CATALOG}"
+ )
+ multi_xmlcatalog_add "${ROOTCATALOG}" "${adds[@]}"
}
#
@@ -173,7 +196,7 @@
#
populate_dtd() {
local dtd=$1 docbookdir=${1%/*} dtd_date
- local v=${docbookdir##*-}
+ local v=${docbookdir##*-} adds
# sanity check
if [[ ${dtd} != */xml-dtd-*/* ]]; then
@@ -184,16 +207,19 @@
# Populate the docbook catalog with this version
verb " Populating ${CATALOG} based on ${docbookdir}"
- xmlcatalog --noout --add "public" "-//OASIS//ELEMENTS DocBook XML Information Pool V${v}//EN" "file://${docbookdir}/dbpoolx.mod" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//DTD DocBook XML V${v}//EN" "file://${docbookdir}/docbookx.dtd" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//ENTITIES DocBook XML Character Entities V${v}//EN" "file://${docbookdir}/dbcentx.mod" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//ENTITIES DocBook XML Notations V${v}//EN" "file://${docbookdir}/dbnotnx.mod" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V${v}//EN" "file://${docbookdir}/dbgenent.mod" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${v}//EN" "file://${docbookdir}/dbhierx.mod" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://${docbookdir}/soextblx.dtd" ${CATALOG}
- xmlcatalog --noout --add "public" "-//OASIS//DTD DocBook XML CALS Table Model V${v}//EN" "file://${docbookdir}/calstblx.dtd" ${CATALOG}
- xmlcatalog --noout --add "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${v}" "file://${docbookdir}" ${CATALOG}
- xmlcatalog --noout --add "rewriteURI" "http://www.oasis-open.org/docbook/xml/${v}" "file://${docbookdir}" ${CATALOG}
+ adds=(
+ "public" "-//OASIS//ELEMENTS DocBook XML Information Pool V${v}//EN" "${docbookdir}/dbpoolx.mod"
+ "public" "-//OASIS//DTD DocBook XML V${v}//EN" "${docbookdir}/docbookx.dtd"
+ "public" "-//OASIS//ENTITIES DocBook XML Character Entities V${v}//EN" "${docbookdir}/dbcentx.mod"
+ "public" "-//OASIS//ENTITIES DocBook XML Notations V${v}//EN" "${docbookdir}/dbnotnx.mod"
+ "public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V${v}//EN" "${docbookdir}/dbgenent.mod"
+ "public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${v}//EN" "${docbookdir}/dbhierx.mod"
+ "public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "${docbookdir}/soextblx.dtd"
+ "public" "-//OASIS//DTD DocBook XML CALS Table Model V${v}//EN" "${docbookdir}/calstblx.dtd"
+ "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${v}" "${docbookdir}"
+ "rewriteURI" "http://www.oasis-open.org/docbook/xml/${v}" "${docbookdir}"
+ )
+ multi_xmlcatalog_add "${CATALOG}" "${adds[@]}"
# grab the RCS date from docbookx.dtd for comparison purposes
if [[ ! -f ${docbookdir}/ent/iso-lat1.ent ]]; then
@@ -220,7 +246,7 @@
#
populate_simple_dtd() {
local dtd=$1 docbookdir=${1%/*}
- local v=${docbookdir##*-}
+ local v=${docbookdir##*-} adds
# sanity check
if [[ ${dtd} != */xml-simple-dtd-*/* ]]; then
@@ -231,9 +257,12 @@
# Populate the docbook catalog with this version
verb " Populating ${CATALOG} based on ${docbookdir}"
- xmlcatalog --noout --add "public" "-//OASIS//DTD Simplified DocBook XML V${v}//EN" "file://${docbookdir}/sdocbook.dtd" ${CATALOG}
- xmlcatalog --noout --add "rewriteSystem" "http://www.oasis-open.org/docbook/xml/simple/${v}" "file://${docbookdir}" ${CATALOG}
- xmlcatalog --noout --add "rewriteURI" "http://www.oasis-open.org/docbook/xml/simple/${v}" "file://${docbookdir}" ${CATALOG}
+ adds=(
+ "public" "-//OASIS//DTD Simplified DocBook XML V${v}//EN" "${docbookdir}/sdocbook.dtd"
+ "rewriteSystem" "http://www.oasis-open.org/docbook/xml/simple/${v}" "${docbookdir}"
+ "rewriteURI" "http://www.oasis-open.org/docbook/xml/simple/${v}" "${docbookdir}"
+ )
+ multi_xmlcatalog_add "${CATALOG}" "${adds[@]}"
}
#
@@ -308,7 +337,7 @@
# populate XSL stylesheets
#
populate_xsl() {
- local f
+ local f adds
# This is either xsl, xsl-ns, xsl-saxon or xsl-xalan
local type=$1
@@ -333,12 +362,18 @@
echo "Found DocBook XSL stylesheets (${type}) in ${xsldir}"
verb " Populating ${ROOTCATALOG} with XSL delegations"
- xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG}
- xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG}
+ adds=(
+ "delegateSystem" "http://docbook.sourceforge.net/release/${type}/" "${CATALOG}"
+ "delegateURI" "http://docbook.sourceforge.net/release/${type}/" "${CATALOG}"
+ )
+ multi_xmlcatalog_add "${ROOTCATALOG}" "${adds[@]}"
verb " Populating ${CATALOG} with XSL stylesheets"
- xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG}
- xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG}
+ adds=(
+ "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/current" "${xsldir}"
+ "rewriteURI" "http://docbook.sourceforge.net/release/${type}/current" "${xsldir}"
+ )
+ multi_xmlcatalog_add "${CATALOG}" "${adds[@]}"
}
# Call the main routine
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-27 22:54 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-27 22:54 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/27 22:54:41
Modified: build-docbook-catalog
Log:
add quotes to path vars to be consistent, and to be defensive in case of spaces/etc...
Revision Changes Path
1.15 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.14&r2=1.15
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build-docbook-catalog 27 Mar 2012 22:50:44 -0000 1.14
+++ build-docbook-catalog 27 Mar 2012 22:54:41 -0000 1.15
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.14 2012/03/27 22:50:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.15 2012/03/27 22:54:41 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -59,8 +59,8 @@
# Clean out old dtds from catalog
verb "Cleaning out old DocBook XML versions from ${CATALOG} and ${ROOTCATALOG}"
- clean_catalog "${DOCBOOKDIR}/xml\(-simple\)*-dtd-[^/\"']*/[^/\"']*" ${CATALOG}
- clean_catalog "${DOCBOOKDIR}/xml\(-simple\)*-dtd-[^/\"']*/[^/\"']*" ${ROOTCATALOG}
+ clean_catalog "${DOCBOOKDIR}/xml\(-simple\)*-dtd-[^/\"']*/[^/\"']*" "${CATALOG}"
+ clean_catalog "${DOCBOOKDIR}/xml\(-simple\)*-dtd-[^/\"']*/[^/\"']*" "${ROOTCATALOG}"
if set_dtds; then
for d in ${DTDS}; do
@@ -97,8 +97,8 @@
DTDS= SIMPLE_DTS=
if [[ -d ${DOCBOOKDIR} ]] ; then
- DTDS=$(find ${DOCBOOKDIR} -path '*/xml-dtd-*/docbookx.dtd')
- SIMPLE_DTDS=$(find ${DOCBOOKDIR} -path '*/xml-simple-dtd-*/sdocbook.dtd')
+ DTDS=$(find "${DOCBOOKDIR}" -path '*/xml-dtd-*/docbookx.dtd')
+ SIMPLE_DTDS=$(find "${DOCBOOKDIR}" -path '*/xml-simple-dtd-*/sdocbook.dtd')
fi
if [[ -z ${DTDS} ]]; then
@@ -136,7 +136,7 @@
if [[ ! -r ${ROOTCATALOG} ]] ; then
echo "Creating XML Catalog root ${ROOTCATALOG}"
- xmlcatalog --noout --create ${ROOTCATALOG}
+ xmlcatalog --noout --create "${ROOTCATALOG}"
if [[ ! -r ${ROOTCATALOG} ]] ; then
error "failed creating ${ROOTCATALOG}"
fi
@@ -144,12 +144,12 @@
verb "Found XML Catalog root ${ROOTCATALOG}"
# clean out existing entries
verb " Cleaning existing ${CATALOG} delegates from ${ROOTCATALOG}"
- clean_catalog "file://${CATALOG}" ${ROOTCATALOG}
+ clean_catalog "file://${CATALOG}" "${ROOTCATALOG}"
fi
if [[ ! -r ${CATALOG} ]] ; then
echo "Creating DocBook XML Catalog ${CATALOG}"
- xmlcatalog --noout --create ${CATALOG}
+ xmlcatalog --noout --create "${CATALOG}"
if [[ ! -r ${CATALOG} ]] ; then
error "failed creating ${CATALOG}"
fi
@@ -186,7 +186,7 @@
list=$(egrep --only-matching "${regex}" "${catalog}" | sort -u)
for f in ${list}; do
- xmlcatalog --noout --del "${f}" ${catalog}
+ xmlcatalog --noout --del "${f}" "${catalog}"
done
}
@@ -304,7 +304,7 @@
)
# here are the entities available; assume no spaces in filenames...
- avail=($(ls ${isodir} | sort))
+ avail=($(ls "${isodir}" | sort))
# double-check the lists
verb " Populating ${CATALOG} with ISO DocBook entities"
@@ -324,7 +324,7 @@
let i=i+2
elif [[ ${entities[i]} == ${avail[j]} ]]; then
xmlcatalog --noout --add "public" "${entities[i+1]}" \
- "file://${isodir}/${entities[i]}" ${CATALOG}
+ "file://${isodir}/${entities[i]}" "${CATALOG}"
let j=j+1
let i=i+2
else
@@ -343,8 +343,8 @@
local type=$1
# Delete current entries from the catalog (delete legacy versioned entries too)
- clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" $CATALOG
- clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" $ROOTCATALOG
+ clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" "${CATALOG}"
+ clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" "${ROOTCATALOG}"
local xsldir=/usr/share/sgml/docbook/${type}-stylesheets
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-28 18:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-28 18:46 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/28 18:46:29
Modified: build-docbook-catalog
Log:
be consistent in variable style: ${foo} rather than $foo
Revision Changes Path
1.16 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.15&r2=1.16
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build-docbook-catalog 27 Mar 2012 22:54:41 -0000 1.15
+++ build-docbook-catalog 28 Mar 2012 18:46:29 -0000 1.16
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.15 2012/03/27 22:54:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.16 2012/03/28 18:46:29 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -40,10 +40,10 @@
main() {
local d v opts
- opts=$(getopt -o hv --long help,verbose -n "$ZERO" -- "$@") || exit 1
- eval set -- "$opts"
+ opts=$(getopt -o hv --long help,verbose -n "${ZERO}" -- "$@") || exit 1
+ eval set -- "${opts}"
while true; do
- case "$1" in
+ case $1 in
-h|--help) usage ;;
-v|--verbose) VERBOSE=true ;;
--) break ;;
@@ -54,7 +54,7 @@
create_catalogs # will exit on error
for type in xsl xsl-ns xsl-saxon xsl-xalan; do
- populate_xsl $type
+ populate_xsl ${type}
done
# Clean out old dtds from catalog
@@ -79,7 +79,7 @@
# verbose echo -- only echo if called with --verbose
#
verb() {
- $VERBOSE && echo "$*"
+ ${VERBOSE} && echo "$*"
}
#
@@ -233,8 +233,8 @@
return 0
fi
verb " RCS datestamp in ${dtd} is ${dtd_date}"
- dtd_date=$(date -d "$dtd_date" +%s)
- if [[ -z $LATEST_DTD || $dtd_date -gt $LATEST_DATE ]]; then
+ dtd_date=$(date -d "${dtd_date}" +%s)
+ if [[ ${dtd_date} -gt ${LATEST_DATE:-0} ]] ; then
LATEST_DATE=${dtd_date}
LATEST_DTD=${dtd}
fi
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-28 19:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-28 19:02 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/28 19:02:47
Modified: build-docbook-catalog
Log:
use $DOCBOOKDIR rather than hardcoding the full path twice
Revision Changes Path
1.17 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.16&r2=1.17
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build-docbook-catalog 28 Mar 2012 18:46:29 -0000 1.16
+++ build-docbook-catalog 28 Mar 2012 19:02:47 -0000 1.17
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.16 2012/03/28 18:46:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.17 2012/03/28 19:02:47 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -346,7 +346,7 @@
clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" "${CATALOG}"
clean_catalog "${DOCBOOKDIR}/${type}-stylesheets(-[0-9\.]+)?" "${ROOTCATALOG}"
- local xsldir=/usr/share/sgml/docbook/${type}-stylesheets
+ local xsldir=${DOCBOOKDIR}/${type}-stylesheets
if [[ ! -d ${xsldir} ]]; then
echo "DocBook XSL stylesheets (${type}) not found" >&2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-28 19:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-28 19:27 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/28 19:27:46
Modified: build-docbook-catalog
Log:
add $ROOT support #389243 by Zdenek Behan
Revision Changes Path
1.18 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.17&r2=1.18
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build-docbook-catalog 28 Mar 2012 19:02:47 -0000 1.17
+++ build-docbook-catalog 28 Mar 2012 19:27:46 -0000 1.18
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.17 2012/03/28 19:02:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.18 2012/03/28 19:27:46 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -27,6 +27,7 @@
Usage: ${ZERO} [options]
Options:
+ -r, --root ROOT path to work on
-v, --verbose Be verbose
-h, --help This!
EOF
@@ -40,11 +41,12 @@
main() {
local d v opts
- opts=$(getopt -o hv --long help,verbose -n "${ZERO}" -- "$@") || exit 1
+ opts=$(getopt -o hr:v --long help,root:,verbose -n "${ZERO}" -- "$@") || exit 1
eval set -- "${opts}"
while true; do
case $1 in
-h|--help) usage ;;
+ -r|--root) ROOT=$2 ; shift ;;
-v|--verbose) VERBOSE=true ;;
--) break ;;
*) usage "options parsing failed on $1!" ;;
@@ -52,6 +54,13 @@
shift
done
+ : ${ROOT:=/}
+ [[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
+ [[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
+ if [[ ${ROOT} != "/" ]] ; then
+ echo "Working on root ${ROOT}"
+ fi
+
create_catalogs # will exit on error
for type in xsl xsl-ns xsl-saxon xsl-xalan; do
populate_xsl ${type}
@@ -96,9 +105,12 @@
set_dtds() {
DTDS= SIMPLE_DTS=
- if [[ -d ${DOCBOOKDIR} ]] ; then
- DTDS=$(find "${DOCBOOKDIR}" -path '*/xml-dtd-*/docbookx.dtd')
- SIMPLE_DTDS=$(find "${DOCBOOKDIR}" -path '*/xml-simple-dtd-*/sdocbook.dtd')
+ local d=${ROOT}${DOCBOOKDIR}
+ if [[ -d ${d} ]] ; then
+ pushd "${d}" >/dev/null || return 1
+ DTDS=$(find xml-dtd-*/ -name docbookx.dtd)
+ SIMPLE_DTDS=$(find xml-simple-dtd-*/ -name sdocbook.dtd)
+ popd >/dev/null
fi
if [[ -z ${DTDS} ]]; then
@@ -115,7 +127,7 @@
# the opts array is a set of three: what gets passed to --add
#
multi_xmlcatalog_add() {
- local file=$1
+ local file="${ROOT}$1"
shift
while [[ $# -gt 0 ]] ; do
@@ -130,14 +142,14 @@
create_catalogs() {
local adds
- if [[ ! -d ${ROOTCONFDIR} ]] ; then
- mkdir -p "${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
+ if [[ ! -d ${ROOT}${ROOTCONFDIR} ]] ; then
+ mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
fi
- if [[ ! -r ${ROOTCATALOG} ]] ; then
+ if [[ ! -r ${ROOT}${ROOTCATALOG} ]] ; then
echo "Creating XML Catalog root ${ROOTCATALOG}"
- xmlcatalog --noout --create "${ROOTCATALOG}"
- if [[ ! -r ${ROOTCATALOG} ]] ; then
+ xmlcatalog --noout --create "${ROOT}${ROOTCATALOG}"
+ if [[ ! -r ${ROOT}${ROOTCATALOG} ]] ; then
error "failed creating ${ROOTCATALOG}"
fi
else
@@ -147,10 +159,10 @@
clean_catalog "file://${CATALOG}" "${ROOTCATALOG}"
fi
- if [[ ! -r ${CATALOG} ]] ; then
+ if [[ ! -r ${ROOT}${CATALOG} ]] ; then
echo "Creating DocBook XML Catalog ${CATALOG}"
- xmlcatalog --noout --create "${CATALOG}"
- if [[ ! -r ${CATALOG} ]] ; then
+ xmlcatalog --noout --create "${ROOT}${CATALOG}"
+ if [[ ! -r ${ROOT}${CATALOG} ]] ; then
error "failed creating ${CATALOG}"
fi
else
@@ -182,7 +194,7 @@
# $2 == catalog
#
clean_catalog() {
- local list f regex=$1 catalog=$2
+ local list f regex=$1 catalog=${ROOT}$2
list=$(egrep --only-matching "${regex}" "${catalog}" | sort -u)
for f in ${list}; do
@@ -192,11 +204,13 @@
#
# populate a specific dtd version into the docbook catalog
-# $1 == /path/to/docbookx.dtd
+# $1 == ./subpath/to/docbookx.dtd
#
populate_dtd() {
- local dtd=$1 docbookdir=${1%/*} dtd_date
- local v=${docbookdir##*-} adds
+ local dtd=${DOCBOOKDIR}/$1
+ local docbookdir=${dtd%/*}
+ local v=${docbookdir##*-}
+ local adds dtd_date
# sanity check
if [[ ${dtd} != */xml-dtd-*/* ]]; then
@@ -222,12 +236,13 @@
multi_xmlcatalog_add "${CATALOG}" "${adds[@]}"
# grab the RCS date from docbookx.dtd for comparison purposes
- if [[ ! -f ${docbookdir}/ent/iso-lat1.ent ]]; then
+ if [[ ! -f ${ROOT}${docbookdir}/ent/iso-lat1.ent ]]; then
verb " No entities available for ${dtd}"
return 0
fi
dtd_date=$(egrep --only-matching --max-count=1 \
- '[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}' "${dtd}")
+ '[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}' \
+ "${ROOT}${dtd}")
if [[ -z ${dtd_date} ]]; then
verb " Couldn't find RCS date in ${dtd}, ignoring entities"
return 0
@@ -242,11 +257,13 @@
#
# populate a specific simple dtd version into the docbook catalog
-# $1 == /path/to/sdocbook.dtd
+# $1 == ./subpath/to/sdocbook.dtd
#
populate_simple_dtd() {
- local dtd=$1 docbookdir=${1%/*}
- local v=${docbookdir##*-} adds
+ local dtd=${DOCBOOKDIR}/$1
+ local docbookdir=${dtd%/*}
+ local v=${docbookdir##*-}
+ local adds dtd_date
# sanity check
if [[ ${dtd} != */xml-simple-dtd-*/* ]]; then
@@ -273,7 +290,7 @@
local entities=() avail=()
# sanity check
- if [[ -z ${LATEST_DTD} || ! -d ${isodir} ]]; then
+ if [[ -z ${LATEST_DTD} || ! -d ${ROOT}${isodir} ]]; then
echo "No ISO DocBook entities available for catalog"
return 0
fi
@@ -304,7 +321,7 @@
)
# here are the entities available; assume no spaces in filenames...
- avail=($(ls "${isodir}" | sort))
+ avail=($(ls "${ROOT}${isodir}" | sort))
# double-check the lists
verb " Populating ${CATALOG} with ISO DocBook entities"
@@ -324,7 +341,7 @@
let i=i+2
elif [[ ${entities[i]} == ${avail[j]} ]]; then
xmlcatalog --noout --add "public" "${entities[i+1]}" \
- "file://${isodir}/${entities[i]}" "${CATALOG}"
+ "file://${isodir}/${entities[i]}" "${ROOT}${CATALOG}"
let j=j+1
let i=i+2
else
@@ -348,12 +365,12 @@
local xsldir=${DOCBOOKDIR}/${type}-stylesheets
- if [[ ! -d ${xsldir} ]]; then
+ if [[ ! -d ${ROOT}${xsldir} ]] ; then
echo "DocBook XSL stylesheets (${type}) not found" >&2
return 1
fi
- if [[ ! -e ${xsldir}/html/docbook.xsl || ! -e ${xsldir}/common/l10n.xml ]]; then
+ if [[ ! -e ${ROOT}${xsldir}/html/docbook.xsl || ! -e ${ROOT}${xsldir}/common/l10n.xml ]] ; then
echo "DocBook XSL stylesheets are missing files from ${xsldir}" >&2
return 1
fi
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2012-03-28 19:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 18+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-28 19:34 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/28 19:34:46
Modified: build-docbook-catalog
Log:
add locking to /etc/xml dir to avoid multiple runs trashing each other
Revision Changes Path
1.19 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.18&r2=1.19
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build-docbook-catalog 28 Mar 2012 19:27:46 -0000 1.18
+++ build-docbook-catalog 28 Mar 2012 19:34:46 -0000 1.19
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.18 2012/03/28 19:27:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.19 2012/03/28 19:34:46 vapier Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -61,6 +61,15 @@
echo "Working on root ${ROOT}"
fi
+ if [[ ! -d ${ROOT}${ROOTCONFDIR} ]] ; then
+ mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
+ fi
+
+ (
+ # Lock the dir to avoid trashing other runs that might
+ # be running parallel.
+ flock 123 || error "unable to lock ${ROOTCONFDIR}"
+
create_catalogs # will exit on error
for type in xsl xsl-ns xsl-saxon xsl-xalan; do
populate_xsl ${type}
@@ -81,6 +90,8 @@
populate_entities
fi
+ ) 123>"${ROOT}${ROOTCONFDIR}/.keep"
+
exit 0
}
@@ -142,10 +153,6 @@
create_catalogs() {
local adds
- if [[ ! -d ${ROOT}${ROOTCONFDIR} ]] ; then
- mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
- fi
-
if [[ ! -r ${ROOT}${ROOTCATALOG} ]] ; then
echo "Creating XML Catalog root ${ROOTCATALOG}"
xmlcatalog --noout --create "${ROOT}${ROOTCATALOG}"
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog
@ 2016-05-23 15:53 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 18+ messages in thread
From: Michael Haubenwallner (haubi) @ 2016-05-23 15:53 UTC (permalink / raw
To: gentoo-commits
haubi 16/05/23 15:53:13
Modified: build-docbook-catalog
Log:
Prepend ROOT with "/." when "//" redirects to network (as in Cygwin).
Revision Changes Path
1.21 build-docbook-catalog/build-docbook-catalog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.20&r2=1.21
Index: build-docbook-catalog
===================================================================
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build-docbook-catalog 28 Sep 2013 02:30:06 -0000 1.20
+++ build-docbook-catalog 23 May 2016 15:53:13 -0000 1.21
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.20 2013/09/28 02:30:06 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.21 2016/05/23 15:53:13 haubi Exp $
#
# build-docbook-catalog: populate /etc/xml/docbook based in
# installed docbook-xml-dtd versions.
@@ -62,6 +62,7 @@
if [[ ${ROOT} != "/" ]] ; then
echo "Working on root ${ROOT}"
fi
+ [[ // -ef / ]] || ROOT="/.${ROOT}" # "//" might refer to network
if [[ ! -d ${ROOT}${ROOTCONFDIR} ]] ; then
mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2016-05-23 15:53 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-27 22:54 [gentoo-commits] gentoo-src commit in build-docbook-catalog: build-docbook-catalog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2016-05-23 15:53 Michael Haubenwallner (haubi)
2012-03-28 19:34 Mike Frysinger (vapier)
2012-03-28 19:27 Mike Frysinger (vapier)
2012-03-28 19:02 Mike Frysinger (vapier)
2012-03-28 18:46 Mike Frysinger (vapier)
2012-03-27 22:50 Mike Frysinger (vapier)
2012-03-27 22:46 Mike Frysinger (vapier)
2012-03-27 22:44 Mike Frysinger (vapier)
2012-03-27 22:41 Mike Frysinger (vapier)
2012-03-27 22:39 Mike Frysinger (vapier)
2012-03-27 21:28 Mike Frysinger (vapier)
2012-03-27 21:23 Mike Frysinger (vapier)
2011-11-01 21:04 Mike Frysinger (vapier)
2011-03-29 2:11 Diego Petteno (flameeyes)
2009-08-23 16:06 Diego Petteno (flameeyes)
2008-09-22 14:10 Diego Petteno (flameeyes)
2008-09-22 13:43 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox