From 94f19211b60216837037b8d380677cf51cf3e3af Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Jun 2010 16:18:44 +0000 Subject: propagate --edit disabling to bindirs git-svn-id: svn://tug.org/texlive/trunk@18914 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/powerpc-aix/fmtutil | 50 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'Master/bin/powerpc-aix') diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil index a24df810123..2aa8c3a0643 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 18642 2010-05-31 11:55:10Z mpg $' +version='$Id: fmtutil 18913 2010-06-12 16:17:53Z karl $' cnf=fmtutil.cnf # name of the config file export PATH @@ -86,9 +86,9 @@ help() cat < eof @@ -479,12 +483,12 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; - --quiet|-q) + --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) ;; "") break;; - *) abort "$progname: unknown option \`$1'. Try $progname --help for help";; + *) abort "unknown option \`$1'. Try $progname --help for help";; esac do test $# -gt 0 && shift; done @@ -513,26 +517,24 @@ main() fi fi - # showhyphen and edit do not need any temp. directory, so do it here: + # these commands need no temp directory, so do them here: case "$cmd" in - showhyphen) - show_hyphen_file "$arg" - cleanup $? - ;; - edit) - ${VISUAL-${EDITOR-vi}} $cnf_file - ;; - enablefmt|disablefmt) - $cmd $arg - ;; catcfg) grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort - cleanup $? - ;; + cleanup $? ;; + edit) + echo "$0: fmtutil --edit is disabled in TeX Live;" >&2 + echo "$0: use a file fmtutil-local.cnf instead." >&2 + echo "$0: See tlmgr --help or http://tug.org/texlive/doc/tlmgr.html." >&2 + cleanup 0 ;; + enablefmt|disablefmt) + $cmd $arg ;; # does not return listcfg) listcfg_loop - cleanup $? - ;; + cleanup $? ;; + showhyphen) + show_hyphen_file "$arg" + cleanup $? ;; esac if test -n "$cfgmaint"; then -- cgit v1.2.3