projects
/
claws.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-08-21 [wwp] 2.10.0cvs140
[claws.git]
/
manual
/
xml2pdf
diff --git
a/manual/xml2pdf
b/manual/xml2pdf
index 5830c5bba5a8249c538f30571a5ce686fdaeb22a..d30fa0aa1213745e90fe9454f37c17ea5a24a2f2 100644
(file)
--- a/
manual/xml2pdf
+++ b/
manual/xml2pdf
@@
-10,28
+10,29
@@
then
exit 1
fi
exit 1
fi
-JAVA=`which java`
-if [ "$JAVA" = "" ]
-t
hen
+test -z "$JAVA" && \
+ JAVA=`which java`
+t
est -z "$JAVA" && \
JAVA="$JAVA_HOME/bin/java"
JAVA="$JAVA_HOME/bin/java"
-fi
if [ ! -x "$JAVA" ]
then
if [ ! -x "$JAVA" ]
then
- echo 'error: java not found in your $PATH or in $JAVA_HOME/bin'
\
-
&&
exit 1
+ echo 'error: java not found in your $PATH or in $JAVA_HOME/bin'
+ exit 1
fi
fi
-SAXON=`which saxon`
-if [ "$SAXON" = "" ]
+test -z "$SAXON" && \
+ SAXON=`which saxon`
+if [ -z "$SAXON" ]
then
then
- SAXONJAR='/usr/share/java/saxon.jar'
- if [ ! -f $SAXONJAR ]
+ test -z "$SAXONJAR" && \
+ SAXONJAR='/usr/share/java/saxon.jar'
+ if [ ! -f "$SAXONJAR" ]
then
SAXONJAR='/usr/local/share/java/saxon.jar'
then
SAXONJAR='/usr/local/share/java/saxon.jar'
- if [ ! -f
$SAXONJAR
]
+ if [ ! -f
"$SAXONJAR"
]
then
then
- echo "error: neither saxon nor saxon.jar were found"
\
-
&&
exit 1
+ echo "error: neither saxon nor saxon.jar were found"
+ exit 1
fi
fi
SAXON="$JAVA -jar $SAXONJAR"
fi
fi
SAXON="$JAVA -jar $SAXONJAR"
@@
-43,12
+44,13
@@
then
CATALOG_FILES=$XML_CATALOG_FILES
else
echo "warning: XML_CATALOG_FILES is not set or empty"
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"
+ CATALOG_FILES="/usr/local/etc/xml/catalog /etc/xml/catalog
+ /usr/local/share/xml/catalog $HOME/xml/catalog"
fi
KEY="http://docbook.sourceforge.net/release/xsl/current"
# manual base name
fi
KEY="http://docbook.sourceforge.net/release/xsl/current"
# manual base name
-SCM=
sylpheed-claws
-manual
+SCM=
claws-mail
-manual
for CATALOG in $CATALOG_FILES
do
for CATALOG in $CATALOG_FILES
do
@@
-64,8
+66,8
@@
do
continue
fi
continue
fi
- test "
${DOCBOOKXSLPATH:0:7}" =
= "file://" && \
- DOCBOOKXSLPATH=
${DOCBOOKXSLPATH:7}
+ test "
`echo ${DOCBOOKXSLPATH} | cut -c 1-7`"
= "file://" && \
+ DOCBOOKXSLPATH=
`echo ${DOCBOOKXSLPATH} | cut -c 8-`
if [ -n "$DOCBOOKXSLPATH" ]
then
echo "docbook-xsl path found: $DOCBOOKXSLPATH"
if [ -n "$DOCBOOKXSLPATH" ]
then
echo "docbook-xsl path found: $DOCBOOKXSLPATH"