Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
texi2dvi: avoid "\n" in echos to please Bash 3.2.
It is virtually impossible to find a safe means to use
echo with \n in it. So use cat and here docs.
* bin/texi2dvi ($usage): Remove, replaced by...
(usage): this function.
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.125
diff -u -u -r1.125 texi2dvi
--- util/texi2dvi 16 Jun 2008 10:19:51 -0000 1.125
+++ util/texi2dvi 16 Jun 2008 10:23:35 -0000
@@ -47,7 +47,10 @@
build_mode=${TEXI2DVI_BUILD_MODE:-local}
build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
-usage="Usage: $program [OPTION]... FILE...
+usage ()
+{
+ cat <<EOF
+Usage: $program [OPTION]... FILE...
Run each Texinfo or (La)TeX FILE through TeX in turn until all
cross-references are resolved, building all indices. The directory
@@ -137,7 +140,10 @@
Email bug reports to <[email protected]>,
general questions and discussion to <[EMAIL PROTECTED]>.
-Texinfo home page: http://www.gnu.org/software/texinfo/";
+Texinfo home page: http://www.gnu.org/software/texinfo/
+EOF
+ exit 0
+}
# Initialize variables for option overriding and otherwise.
# Don't use `unset' since old bourne shells don't have this command.
@@ -1471,7 +1477,7 @@
--dvi) out_lang=dvi;;
--dvipdf) out_lang=dvipdf;;
-e | -E | --expand) expand=t;;
- -h | --help) echo "$usage"; exit 0;;
+ -h | --help) usage;;
--html) out_lang=html;;
-I) shift; list_concat_dirs includes "$1";;
--info) out_lang=info;;
