diff --git a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh index 1f59e708c8f458c0d3b60bbe9b6033458ec369e4..fa9dcd6497a972bfc9aa1e62e1f8dad3468c1f5f 100644 --- a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh +++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh @@ -1,13 +1,7 @@ -if [ -z "$SGML_CATALOG_FILES" ] ; then - for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do - if [ -n "$i" -a -r "$i" ] ; then - SGML_CATALOG_FILES="$i" - break - fi - done -fi +DOCBOOK_CATALOG=$1 +shift -if [ -z "$SGML_CATALOG_FILES" ] ; then +if [ ! -f "$DOCBOOK_CATALOG" ] ; then echo "CATALOG file not set up; see installation guide for details." exit 1 fi @@ -44,7 +38,7 @@ echo OUTPUT FILE NAME IS $output TMPFN=`echo $1 | sed 's/\.sgml//'` -$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $SGML_CATALOG_FILES $1 +$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $DOCBOOK_CATALOG $1 jadetex ${TMPFN}.tex diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh index 383e1276b8579368a3a62eebb066a9c39017d3c8..6cdae0e26d43d2095ad497f98cbb7fb799427db8 100644 --- a/glafp-utils/docbook/db2html.dir/db2html.sh +++ b/glafp-utils/docbook/db2html.dir/db2html.sh @@ -1,13 +1,7 @@ -if [ -z "$SGML_CATALOG_FILES" ] ; then - for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do - if [ -n "$i" -a -r "$i" ] ; then - SGML_CATALOG_FILES="$i" - break - fi - done -fi +DOCBOOK_CATALOG=$1 +shift -if [ -z "$SGML_CATALOG_FILES" ] ; then +if [ ! -f "$DOCBOOK_CATALOG" ] ; then echo "CATALOG file not set up; see installation guide for details." exit 1 fi @@ -62,10 +56,10 @@ mkdir $TMPDIR SAVE_PWD=`pwd` if [ $1 = `basename $1` ]; then echo "working on ../$1" - (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $SGML_CATALOG_FILES ../$1; cd $SAVE_PWD) + (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG ../$1; cd $SAVE_PWD) else echo "working on $1" - (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $SGML_CATALOG_FILES $1; cd $SAVE_PWD) + (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG $1; cd $SAVE_PWD) fi if [ $# -eq 1 ] diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh index c7c259d27b5b2e14c9309d010ad601065cbdd8d5..3dab6742f4fc22f6d776c21229c566151ed69924 100644 --- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh +++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh @@ -1,13 +1,7 @@ -if [ -z "$SGML_CATALOG_FILES" ] ; then - for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do - if [ -n "$i" -a -r "$i" ] ; then - SGML_CATALOG_FILES="$i" - break - fi - done -fi +DOCBOOK_CATALOG=$1 +shift -if [ -z "$SGML_CATALOG_FILES" ] ; then +if [ ! -f "$DOCBOOK_CATALOG" ] ; then echo "CATALOG file not set up; see installation guide for details." exit 1 fi @@ -42,7 +36,7 @@ then fi fi -$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $SGML_CATALOG_FILES $1 +$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $DOCBOOK_CATALOG $1 pdf$JADEtex $TMPFN diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh index 48b352132533d9d3b6d9bb418a2bd7cec23d9221..947775f02c36bf0f98f277e00e227300ce133566 100644 --- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh +++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh @@ -1,13 +1,7 @@ -if [ -z "$SGML_CATALOG_FILES" ] ; then - for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do - if [ -n "$i" -a -r "$i" ] ; then - SGML_CATALOG_FILES="$i" - break - fi - done -fi +DOCBOOK_CATALOG=$1 +shift -if [ -z "$SGML_CATALOG_FILES" ] ; then +if [ ! -f "$DOCBOOK_CATALOG" ] ; then echo "CATALOG file not set up; see installation guide for details." exit 1 fi @@ -42,7 +36,7 @@ then fi fi -cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $SGML_CATALOG_FILES +cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $DOCBOOK_CATALOG if [ $# -eq 1 ] then