diff options
-rwxr-xr-x | Master/bin/alpha-linux/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/amd64-freebsd/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/amd64-kfreebsd/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/i386-cygwin/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/i386-freebsd/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/i386-kfreebsd/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/i386-linux/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/i386-netbsd/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/i386-solaris/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/mips-irix/fmtutil | 31 | ||||
-rwxr-xr-x | Master/bin/powerpc-aix/fmtutil | 31 | ||||
-rwxr-xr-x | Master/bin/powerpc-linux/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/sparc-linux/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/sparc-solaris/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/universal-darwin/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/x86_64-darwin/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/x86_64-linux/fmtutil | 22 | ||||
-rwxr-xr-x | Master/bin/x86_64-solaris/fmtutil | 22 |
18 files changed, 354 insertions, 60 deletions
diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/alpha-linux/fmtutil +++ b/Master/bin/alpha-linux/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/amd64-freebsd/fmtutil +++ b/Master/bin/amd64-freebsd/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/amd64-kfreebsd/fmtutil b/Master/bin/amd64-kfreebsd/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/amd64-kfreebsd/fmtutil +++ b/Master/bin/amd64-kfreebsd/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/i386-cygwin/fmtutil b/Master/bin/i386-cygwin/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/i386-cygwin/fmtutil +++ b/Master/bin/i386-cygwin/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/i386-freebsd/fmtutil +++ b/Master/bin/i386-freebsd/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/i386-kfreebsd/fmtutil b/Master/bin/i386-kfreebsd/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/i386-kfreebsd/fmtutil +++ b/Master/bin/i386-kfreebsd/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/i386-linux/fmtutil +++ b/Master/bin/i386-linux/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/i386-netbsd/fmtutil b/Master/bin/i386-netbsd/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/i386-netbsd/fmtutil +++ b/Master/bin/i386-netbsd/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/i386-solaris/fmtutil +++ b/Master/bin/i386-solaris/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil index 2aa8c3a0643..d822e474cd9 100755 --- a/Master/bin/mips-irix/fmtutil +++ b/Master/bin/mips-irix/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18913 2010-06-12 16:17:53Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -126,8 +128,10 @@ Valid commands for fmtutil: --version show version info --help show this message -The config file is named fmtutil.cnf, and +The default config file is named fmtutil.cnf, and running kpsewhich fmtutil.cnf should show the active file. +The command kpsewhich --engine=/ --all foo.fmt should show the +locations of any and all foo.fmt files. For more information about fmt generation in TeX Live, try tlmgr --help or see http://tug.org/texlive/doc/tlmgr.html. @@ -245,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -407,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -483,17 +499,20 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) ;; "") break;; - *) abort "unknown option \`$1'. Try $progname --help for help";; + *) abort "unknown option \`$1'; try $progname --help if you need it";; esac do test $# -gt 0 && shift; done case "$cmd" in - help|"") help;; + "") abort "missing command; try $progname --help if you need it";; + help) help;; version) version;; esac @@ -919,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -938,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil index 2aa8c3a0643..d822e474cd9 100755 --- a/Master/bin/powerpc-aix/fmtutil +++ b/Master/bin/powerpc-aix/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18913 2010-06-12 16:17:53Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -126,8 +128,10 @@ Valid commands for fmtutil: --version show version info --help show this message -The config file is named fmtutil.cnf, and +The default config file is named fmtutil.cnf, and running kpsewhich fmtutil.cnf should show the active file. +The command kpsewhich --engine=/ --all foo.fmt should show the +locations of any and all foo.fmt files. For more information about fmt generation in TeX Live, try tlmgr --help or see http://tug.org/texlive/doc/tlmgr.html. @@ -245,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -407,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -483,17 +499,20 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) ;; "") break;; - *) abort "unknown option \`$1'. Try $progname --help for help";; + *) abort "unknown option \`$1'; try $progname --help if you need it";; esac do test $# -gt 0 && shift; done case "$cmd" in - help|"") help;; + "") abort "missing command; try $progname --help if you need it";; + help) help;; version) version;; esac @@ -919,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -938,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/powerpc-linux/fmtutil +++ b/Master/bin/powerpc-linux/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/sparc-linux/fmtutil +++ b/Master/bin/sparc-linux/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/sparc-solaris/fmtutil +++ b/Master/bin/sparc-solaris/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/universal-darwin/fmtutil b/Master/bin/universal-darwin/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/universal-darwin/fmtutil +++ b/Master/bin/universal-darwin/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/x86_64-darwin/fmtutil b/Master/bin/x86_64-darwin/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/x86_64-darwin/fmtutil +++ b/Master/bin/x86_64-darwin/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/x86_64-linux/fmtutil +++ b/Master/bin/x86_64-linux/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } diff --git a/Master/bin/x86_64-solaris/fmtutil b/Master/bin/x86_64-solaris/fmtutil index 7465b9680a2..d822e474cd9 100755 --- a/Master/bin/x86_64-solaris/fmtutil +++ b/Master/bin/x86_64-solaris/fmtutil @@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' +version='$Id: fmtutil 19222 2010-07-04 12:21:30Z preining $' cnf=fmtutil.cnf # name of the config file export PATH @@ -104,6 +104,8 @@ Optional behavior: --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir + --no-error-if-no-format do not exit with error code on some format + related errors --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) @@ -247,6 +249,17 @@ abort() } ############################################################################### +# maybe_abort(errmsg) +# print `errmsg' to stderr and +# unless noAbortFlag is set exit with error code 1 +############################################################################### +maybe_abort() +{ + echo "$progname: $1." >&2 + $noAbortFlag || cleanup 1 +} + +############################################################################### # verboseMsg(msg) # print `msg' to stderr is $verbose is true ############################################################################### @@ -409,6 +422,7 @@ main() cfgmaint= tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ verboseFlag=true + noAbortFlag=false # mktexfmtMode: if called as mktexfmt, set to true. Will echo the # first generated filename after successful generation to stdout then @@ -485,6 +499,8 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; + --no-error-if-no-format) + noAbortFlag=true;; --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) @@ -922,7 +938,7 @@ recreate_by_hyphenfile() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on hyphen file \`$hyphenfile'" + getmatch || maybe_abort "no format depends on hyphen file \`$hyphenfile'" } ############################################################################### @@ -941,7 +957,7 @@ recreate_by_engine() recreate_loop # Now check if there was at least one match: - getmatch || abort "no format depends on engine \`$enginename'" + getmatch || maybe_abort "no format depends on engine \`$enginename'" } |