+2006-06-04 [wwp] 2.2.0cvs80
+
+ * manual/xml2pdf
+ added sanity checks, exit when needed.
+
2006-06-03 [paul] 2.2.0cvs79
* src/prefs_receive.c
( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/pgpmime/pgpmime.c; ) > 2.2.0cvs77.patchset
( cvs diff -u -r 1.23.2.29 -r 1.23.2.30 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.2.0cvs78.patchset
( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_receive.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_send.c; ) > 2.2.0cvs79.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/xml2pdf; ) > 2.2.0cvs80.patchset
if [ $# -ne 2 ]
then
echo "usage: ${0##*/} <file.xsl> <file.xml>"
+ exit 1
fi
-test -n "$XML_CATALOG_FILES" && \
- CATALOG_FILES=$XML_CATALOG_FILES || \
+if [ -n "$XML_CATALOG_FILES" ]
+then
+ CATALOG_FILES=$XML_CATALOG_FILES
+else
+ echo "warning: XML_CATALOG_FILES is not set or empty"
CATALOG_FILES="/usr/local/etc/xml/catalog /etc/xml/catalog $HOME/xml/catalog"
+fi
KEY="http://docbook.sourceforge.net/release/xsl/current"
for CATALOG in $CATALOG_FILES
then
DOCBOOKXSLPATH=$(xmlcatalog "$CATALOG" "$KEY/")
# second chance
- test $? -ne 0 -o -z "$DOCBOOKXSLPATH" && \
+ if [ $? -ne 0 -o -z "$DOCBOOKXSLPATH" ]
+ then
DOCBOOKXSLPATH=$(xmlcatalog "$CATALOG" "$KEY")
+ # still not found
+ test $? -ne 0 -o -z "$DOCBOOKXSLPATH" && \
+ continue
+ fi
test "${DOCBOOKXSLPATH:0:7}" == "file://" && \
DOCBOOKXSLPATH=${DOCBOOKXSLPATH:7}