2006-07-05 [wwp] 2.3.1cvs59

[claws.git] / manual / xml2pdf

diff --git a/manual/xml2pdf b/manual/xml2pdf
index 5830c5bba5a8249c538f30571a5ce686fdaeb22a..be4218f95558865db5aec75012f4ee3cf02aebfe 100644 (file)
--- a/manual/xml2pdf
+++ b/manual/xml2pdf
@@ -10,28 +10,29 @@ then
        exit 1
 fi
 
        exit 1
 fi
 

-JAVA=`which java`
-if [ "$JAVA" = "" ]
-then
+test -z "$JAVA" && \
+       JAVA=`which java`
+test -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"