From 7921464d4efd36adf09b6765859d8bea9b9e4932 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 4 Jul 2010 12:23:28 +0000 Subject: update fmtutil in bin/ARCH git-svn-id: svn://tug.org/texlive/trunk@19223 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/sparc-solaris/fmtutil | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'Master/bin/sparc-solaris') 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) @@ -246,6 +248,17 @@ abort() cleanup 1 } +############################################################################### +# 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'" } -- cgit v1.2.3