8:39 a.m.
backends/dvi | 26 +++++++++++++-------------
backends/html | 2 +-
backends/man.in | 2 +-
backends/pdf | 20 ++++++++++----------
backends/ps | 28 ++++++++++++++--------------
backends/rtf | 2 +-
backends/tex | 2 +-
backends/texi.in | 2 +-
backends/txt | 2 +-
bin/jw.in | 18 +++++++++---------
10 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit a2fdfcb637ca5f57c818b45bc3f62f89a2ab26f6
Author: Ondřej Vašík <ovasik(a)redhat.com>
Date: Tue Feb 1 15:39:44 2011 +0100
various files: add doublequotes around variables - prevent failures for files with
spaces in the name
diff --git a/backends/dvi b/backends/dvi
index ace0cf8..8646065 100644
--- a/backends/dvi
+++ b/backends/dvi
@@ -6,31 +6,31 @@ TEXINPUTS="$(dirname "${SGML_FILE}"):${TEXINPUTS}"
export TEXINPUTS
# Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS
"$SGML_FILE"
if [ $? -ne 0 ]
then exit 1
fi
# Convert from TeX to DVI
-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
+jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
if [ $? -ne 0 ]
then
- cat ${SGML_FILE_NAME}.tmp
- rm ${SGML_FILE_NAME}.tmp
- rm ${SGML_FILE_NAME}.tex
+ cat "${SGML_FILE_NAME}.tmp"
+ rm "${SGML_FILE_NAME}.tmp"
+ rm "${SGML_FILE_NAME}.tex"
exit 2
fi
-rm ${SGML_FILE_NAME}.tmp
+rm "${SGML_FILE_NAME}.tmp"
# If there are unresolved references, re-run jadetex, twice
-if egrep '^LaTeX Warning: There were undefined references.$'
${SGML_FILE_NAME}.log >/dev/null 2>&1
+if egrep '^LaTeX Warning: There were undefined references.$'
"${SGML_FILE_NAME}.log" >/dev/null 2>&1
then
- jadetex ${SGML_FILE_NAME}.tex >/dev/null
- jadetex ${SGML_FILE_NAME}.tex >/dev/null
+ jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+ jadetex "${SGML_FILE_NAME}.tex" >/dev/null
fi
-rm ${SGML_FILE_NAME}.log
-rm ${SGML_FILE_NAME}.aux
-rm ${SGML_FILE_NAME}.tex
-rm ${SGML_FILE_NAME}.out
+rm "${SGML_FILE_NAME}.log"
+rm "${SGML_FILE_NAME}.aux"
+rm "${SGML_FILE_NAME}.tex"
+rm "${SGML_FILE_NAME}.out"
exit 0
diff --git a/backends/html b/backends/html
index ee301f6..ae32a32 100644
--- a/backends/html
+++ b/backends/html
@@ -3,7 +3,7 @@
# This program is under GPL license. See LICENSE file for details.
# Convert to HTML
-$SGML_JADE -t sgml $SGML_ARGUMENTS
+$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE"
if [ $? -ne 0 ]
then exit 1
fi
diff --git a/backends/man.in b/backends/man.in
index e95d3c6..9fe9d3b 100644
--- a/backends/man.in
+++ b/backends/man.in
@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VERSION(a)/helpers/docbook2man-spec.pl
TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
{ echo >&2 "man backend: could not create secure temporary directory";
exit 1;}
trap 'rm -rf "${TMPDIR}"' EXIT
-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
+nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
if [ $? -ne 0 ]
then
diff --git a/backends/pdf b/backends/pdf
index d292f46..dd3e270 100644
--- a/backends/pdf
+++ b/backends/pdf
@@ -6,26 +6,26 @@ TEXINPUTS="$(dirname "${SGML_FILE}"):${TEXINPUTS}"
export TEXINPUTS
# Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS
"$SGML_FILE"
if [ $? -ne 0 ]
then exit 1
fi
# Convert from TeX to PDF
-pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
+pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
if [ $? -ne 0 ]
then
- cat ${SGML_FILE_NAME}.tmp
- rm ${SGML_FILE_NAME}.tmp
- rm ${SGML_FILE_NAME}.tex
+ cat "${SGML_FILE_NAME}.tmp"
+ rm "${SGML_FILE_NAME}.tmp"
+ rm "${SGML_FILE_NAME}.tex"
exit 2
fi
-rm ${SGML_FILE_NAME}.tmp
+rm "${SGML_FILE_NAME}.tmp"
# Unconditionally re-run pdfjadetex, twice
-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
- ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
+pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
+pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
+rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
+ "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
exit 0
diff --git a/backends/ps b/backends/ps
index 160c63b..91d7ebf 100644
--- a/backends/ps
+++ b/backends/ps
@@ -6,30 +6,30 @@ TEXINPUTS="$(dirname "${SGML_FILE}"):${TEXINPUTS}"
export TEXINPUTS
# Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS
"$SGML_FILE"
if [ $? -ne 0 ]
then exit 1
fi
# Convert from TeX to DVI
-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
+jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
if [ $? -ne 0 ]
then
- cat ${SGML_FILE_NAME}.tmp
- rm ${SGML_FILE_NAME}.tmp
- rm ${SGML_FILE_NAME}.tex
+ cat "${SGML_FILE_NAME}.tmp"
+ rm "${SGML_FILE_NAME}.tmp"
+ rm "${SGML_FILE_NAME}.tex"
exit 2
fi
-rm ${SGML_FILE_NAME}.tmp
+rm "${SGML_FILE_NAME}.tmp"
# If there are unresolved references, re-run jadetex, twice
-if egrep '^LaTeX Warning: There were undefined references.$'
${SGML_FILE_NAME}.log >/dev/null 2>&1
+if egrep '^LaTeX Warning: There were undefined references.$'
"${SGML_FILE_NAME}.log" >/dev/null 2>&1
then
- jadetex ${SGML_FILE_NAME}.tex >/dev/null
- jadetex ${SGML_FILE_NAME}.tex >/dev/null
+ jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+ jadetex "${SGML_FILE_NAME}.tex" >/dev/null
fi
-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
- ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
+rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
+ "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
# Convert from DVI to PostScript
PAPERSIZE="-t letter"
@@ -38,12 +38,12 @@ then
PAPERSIZE="-t a4"
fi
-dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps
+dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o
"${SGML_FILE_NAME}.ps"
if [ $? -ne 0 ]
then
- rm ${SGML_FILE_NAME}.dvi
+ rm "${SGML_FILE_NAME}.dvi"
exit 3
fi
-rm ${SGML_FILE_NAME}.dvi
+rm "${SGML_FILE_NAME}.dvi"
exit 0
diff --git a/backends/rtf b/backends/rtf
index b96df5b..3bc05ba 100644
--- a/backends/rtf
+++ b/backends/rtf
@@ -3,7 +3,7 @@
# This program is under GPL license. See LICENSE file for details.
# Convert to RTF
-$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS
+$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS
"$SGML_FILE"
if [ $? -ne 0 ]
then exit 1
fi
diff --git a/backends/tex b/backends/tex
index 56ab924..6bfbcd6 100644
--- a/backends/tex
+++ b/backends/tex
@@ -3,7 +3,7 @@
# This program is under GPL license. See LICENSE file for details.
# Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS
"$SGML_FILE"
if [ $? -ne 0 ]
then exit 1
fi
diff --git a/backends/texi.in b/backends/texi.in
index ab838d2..4c8a8b7 100644
--- a/backends/texi.in
+++ b/backends/texi.in
@@ -3,7 +3,7 @@
# This program is under GPL license. See LICENSE file for details.
# Convert to texinfo
-nsgmls $SGML_FILE | sgmlspl
$SGML_BASE_DIR/docbook/utils-@VERSION(a)/helpers/docbook2texi-spec.pl
>$SGML_FILE_NAME.texi
+nsgmls "$SGML_FILE" | sgmlspl
$SGML_BASE_DIR/docbook/utils-@VERSION(a)/helpers/docbook2texi-spec.pl
>$SGML_FILE_NAME.texi
if [ $? -ne 0 ]
then exit 1
fi
diff --git a/backends/txt b/backends/txt
index 2dd43ba..1a4c734 100644
--- a/backends/txt
+++ b/backends/txt
@@ -23,7 +23,7 @@ HTML=$(mktemp /tmp/html-XXXXXX) || exit 1
trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15
# Convert to HTML
-$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML}
+$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML}
if [ $? -ne 0 ]
then exit 1
fi
diff --git a/bin/jw.in b/bin/jw.in
index ff12036..2523d10 100644
--- a/bin/jw.in
+++ b/bin/jw.in
@@ -246,7 +246,7 @@ then
echo -e $SGML_HELP_MESSAGE >&2
exit 1
fi
-if [ ! -s $SGML_FRONTEND ]
+if [ ! -s "$SGML_FRONTEND" ]
then
echo "`basename $0`: There is no frontend called
\"$SGML_FRONTEND\"." >&2
exit 2
@@ -270,14 +270,14 @@ then
echo -e $SGML_HELP_MESSAGE >&2
exit 1
fi
-if [ ! -s $SGML_FILE ]
+if [ ! -s "$SGML_FILE" ]
then
echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2
exit 3
fi
# Separate the file name and the extension (if any)
-SGML_FILE_NAME=`basename $SGML_FILE`
+SGML_FILE_NAME=`basename "$SGML_FILE"`
SGML_FILE_NAME=${SGML_FILE_NAME%.*}
# Determine if we are in an XML file
@@ -405,9 +405,9 @@ then
echo -e $SGML_HELP_MESSAGE >&2
exit 1
fi
-if [ ! -d $SGML_OUTPUT_DIRECTORY ]
+if [ ! -d "$SGML_OUTPUT_DIRECTORY" ]
then
- mkdir $SGML_OUTPUT_DIRECTORY 2>/dev/null
+ mkdir "$SGML_OUTPUT_DIRECTORY" 2>/dev/null
if [ $? -ne 0 ]
then
echo "`basename $0`: Could not create \"$SGML_OUTPUT_DIRECTORY\"
output directory" >&2
@@ -416,13 +416,13 @@ then
fi
# Prepare the parser's arguments
-SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS
$SGML_WARNINGS $SGML_DECL $SGML_FILE"
+SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS
$SGML_WARNINGS $SGML_DECL"
# Call the backend
echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
echo "Using stylesheet: $SGML_STYLESHEET"
echo "Working on: $SGML_FILE"
-cd $SGML_OUTPUT_DIRECTORY
+cd "$SGML_OUTPUT_DIRECTORY"
export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
@@ -430,10 +430,10 @@ if [ -z "$NOCHUNKS" ]
then
sh $SGML_BACKEND
else
- sh $SGML_BACKEND >$SGML_FILE_NAME.html
+ sh $SGML_BACKEND >"$SGML_FILE_NAME.html"
fi
SGML_RETURN=$?
-cd $SGML_CURRENT_DIRECTORY
+cd "$SGML_CURRENT_DIRECTORY"
if [ $SGML_RETURN -gt 0 ]
then exit `expr 7 + $SGML_RETURN`