preferentially use subprograms from our own directory

git-svn-id: svn://tug.org/texlive/trunk@34656 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 86 insertions, 14 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 28aa77a14d1..7ca8955c5e4 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,17 @@
+2014-07-18  Karl Berry  <karl@tug.org>
+
+	* mktex.opt: don't basename-ify the program name, that's
+	potentially useful information.
+	
+	* mktexdir,
+	* mktexlsr, 
+	* mktexmf,
+	* mktexnam,
+	* mktexpk,
+	* mktextfm,
+	* mktexupd: prepend to PATH via a simple method for Unix
+	(but leave the complicated DOS version in mktexlsr).
+
 2014-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tex-make.c, win32lib.c: Replace the deprecated spawnvp() by
diff --git a/Build/source/texk/kpathsea/mktex.opt b/Build/source/texk/kpathsea/mktex.opt
index b1bd143e8ef..9b123c77691 100644
--- a/Build/source/texk/kpathsea/mktex.opt
+++ b/Build/source/texk/kpathsea/mktex.opt
@@ -1,5 +1,6 @@
 # mktex.opt -- common mktex* options, etc.
-# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set.
+# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set,
+# and optionally mt_min_args and/or mt_max_args.
 # 
 # Originally written by Thomas Esser.  Public domain.
 # $Id$
@@ -8,7 +9,7 @@ if test "x$1" = x--help || test "x$1" = x-help; then
   echo "$usage"
   exit 0
 elif test "x$1" = x--version || test "x$1" = x-version; then
-  echo "`basename $0` $version"
+  echo "$0 $version"
   kpsewhich --version
   exit 0
 elif test $# -lt ${mt_min_args-1}; then
diff --git a/Build/source/texk/kpathsea/mktexdir b/Build/source/texk/kpathsea/mktexdir
index 93ec4dbe5f1..27e00bccafa 100755
--- a/Build/source/texk/kpathsea/mktexdir
+++ b/Build/source/texk/kpathsea/mktexdir
@@ -7,7 +7,14 @@
 # by Thomas Esser, Karl Berry, Olaf Weber, et al.
 
 version='$Id$'
-usage="Usage: $0 DIRS...
+progname=`echo $0 | sed 's%.*/%%'`
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
+usage="Usage: $0 DIR...
   Create each DIR, including any missing leading directories."
 mt_max_args=$#
 
diff --git a/Build/source/texk/kpathsea/mktexlsr b/Build/source/texk/kpathsea/mktexlsr
index 8b00d0fc710..8d4a38018f9 100755
--- a/Build/source/texk/kpathsea/mktexlsr
+++ b/Build/source/texk/kpathsea/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
 version='$Id$'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.
diff --git a/Build/source/texk/kpathsea/mktexmf b/Build/source/texk/kpathsea/mktexmf
index 314b7af2e72..f6b8991e8d1 100755
--- a/Build/source/texk/kpathsea/mktexmf
+++ b/Build/source/texk/kpathsea/mktexmf
@@ -8,11 +8,20 @@
 # Public domain.
 
 version='$Id$'
-progname=`echo $0 | sed 's%.*/%%'`
-usage="Usage: $progname FONT.
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
+usage="Usage: $0 FONT.
 
 Makes the Metafont source file for FONT, if possible. For example,
-\`ecr12' or \`cmr11'."
+\`ecr12' or \`cmr11'.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 
 # Common code for all scripts.
 : ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
diff --git a/Build/source/texk/kpathsea/mktexnam b/Build/source/texk/kpathsea/mktexnam
index 69a975cdc79..958f42bc54c 100755
--- a/Build/source/texk/kpathsea/mktexnam
+++ b/Build/source/texk/kpathsea/mktexnam
@@ -4,8 +4,18 @@
 # Public domain.
 
 version='$Id$'
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 usage="Usage: $0 NAME [DPI MODE] [DESTDIR].
-  Output the PK, TFM, and MF names for a font NAME."
+  Output the PK, TFM, and MF names for a font NAME.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 mt_max_args=4
 
 # Common code for all scripts.
diff --git a/Build/source/texk/kpathsea/mktexpk b/Build/source/texk/kpathsea/mktexpk
index 44881923cd6..4eaafb1d94e 100755
--- a/Build/source/texk/kpathsea/mktexpk
+++ b/Build/source/texk/kpathsea/mktexpk
@@ -5,11 +5,16 @@
 # installation won't write this script over yours.)
 # 
 # Originally written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Report bugs to tex-k@tug.org.
 # Public domain.
 
 version='$Id$'
 progname=`echo $0 | sed 's%.*/%%'`
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
   Create a PK font.
 
diff --git a/Build/source/texk/kpathsea/mktextfm b/Build/source/texk/kpathsea/mktextfm
index 9a10a79bb00..d2c132aad89 100755
--- a/Build/source/texk/kpathsea/mktextfm
+++ b/Build/source/texk/kpathsea/mktextfm
@@ -9,11 +9,21 @@
 
 version='$Id$'
 progname=`echo $0 | sed 's%.*/%%'`
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 usage="Usage: $progname [--destdir DESTDIR] FONT.
 
 Makes a TFM file for FONT, if possible. Use DESTDIR for the root of where
 to install into, either the absolute directory name to use (if it starts
-with a /) or relative to the default DESTDIR (if not)."
+with a /) or relative to the default DESTDIR (if not).
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 
 # Handle non-positional options, except for --version/--help
 while test $# -gt 0; do
diff --git a/Build/source/texk/kpathsea/mktexupd b/Build/source/texk/kpathsea/mktexupd
index 54df6e0fb17..5d8995f45fb 100755
--- a/Build/source/texk/kpathsea/mktexupd
+++ b/Build/source/texk/kpathsea/mktexupd
@@ -3,11 +3,20 @@
 # 
 # Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
 # Public domain.
-# $Id$
 
 version='$Id$'
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 usage="Usage: $0 DIR FILE.
-  Update the ls-R file with an entry for FILE in DIR."
+  Update the ls-R file with an entry for FILE in DIR.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 mt_min_args=2
 mt_max_args=2