From bd345c5c73d812c9d505b379c61a5059cc920678 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Jul 2014 16:41:08 +0000 Subject: sync with dev change git-svn-id: svn://tug.org/texlive/trunk@34642 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/texlive/fmtutil-sys.sh | 7 ++++++- Master/texmf-dist/scripts/texlive/fmtutil.sh | 17 ++++++++++------- Master/texmf-dist/texconfig/tcfmgr | 9 +++++++-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh b/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh index bfb52f94e1f..4091c8cd6ae 100755 --- a/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh +++ b/Master/texmf-dist/scripts/texlive/fmtutil-sys.sh @@ -1,5 +1,5 @@ #!/bin/sh - +# $Id: fmtutil-sys.sh 34641 2014-07-17 16:38:18Z karl $ # fmtutil-sys: Thomas Esser, public domain. # wrapper script for fmtutil with TEXMFVAR and TEXMFCONFIG set to @@ -19,6 +19,11 @@ unset RUNNING_BSH test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' export PATH +# preferentially use subprograms from our own directory. +mydir=`echo "$0" | sed 's,/[^/]*$,,'` +mydir=`cd "$mydir" && pwd` +PATH="$mydir:$PATH"; export PATH + v=`kpsewhich -var-value TEXMFSYSVAR` c=`kpsewhich -var-value TEXMFSYSCONFIG` diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.sh b/Master/texmf-dist/scripts/texlive/fmtutil.sh index 2f96df431c7..494635cd3c6 100755 --- a/Master/texmf-dist/scripts/texlive/fmtutil.sh +++ b/Master/texmf-dist/scripts/texlive/fmtutil.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $Id: fmtutil.sh 34641 2014-07-17 16:38:18Z karl $ # fmtutil - utility to maintain format files. # Public domain. Originally written by Thomas Esser. # Run with --help for usage. @@ -57,12 +58,15 @@ unset RUNNING_BSH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' +# preferentially use subprograms from our own directory. +mydir=`echo "$0" | sed 's,/[^/]*$,,'` +mydir=`cd "$mydir" && pwd` +PATH="$mydir:$PATH"; export PATH + +version='$Id: fmtutil.sh 34641 2014-07-17 16:38:18Z karl $' progname=fmtutil argv0=$0 -version='$Id: fmtutil.sh 30365 2013-05-10 06:53:44Z peter $' - cnf=fmtutil.cnf # name of the config file -export PATH ############################################################################### # cleanup() @@ -104,12 +108,11 @@ 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 exit successfully if no format is selected - --no-error-if-no-engine=ENGINE1,ENGINE2,... + --no-error-if-no-engine ENGINE1,ENGINE2,... exit successfully even if the required engine - is missing, if it is included in the list. + is missing, if it is included in this list + --no-error-if-no-format exit successfully if no format is selected --quiet be silent - --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) --force (not implemented, just for compatibility) diff --git a/Master/texmf-dist/texconfig/tcfmgr b/Master/texmf-dist/texconfig/tcfmgr index d64febf854c..08dddbd4d1a 100755 --- a/Master/texmf-dist/texconfig/tcfmgr +++ b/Master/texmf-dist/texconfig/tcfmgr @@ -1,5 +1,7 @@ #!/bin/sh -# $Id: tcfmgr 28922 2013-01-24 01:12:02Z karl $ +# $Id: tcfmgr 34641 2014-07-17 16:38:18Z karl $ +# tcfmgr - TeX configuration file manager (sort of). +# Public domain. Originally written by Thomas Esser. # invoke the right shell: @@ -13,7 +15,10 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \ && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } unset RUNNING_BSH -export PATH +# preferentially use subprograms from our own directory. +mydir=`echo "$0" | sed 's,/[^/]*$,,'` +mydir=`cd "$mydir" && pwd` +PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' -- cgit v1.2.3