From b97a74010c1cbbc3aa94d19d0243e7b7eb05cad0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jul 2014 00:06:11 +0000 Subject: prepend directory of executable to PATH git-svn-id: svn://tug.org/texlive/trunk@34586 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/texlive/tl_scripts/ChangeLog | 8 ++++++++ .../texk/texlive/tl_scripts/texconfig-dialog.sh | 19 +++++++++++++------ Build/source/texk/texlive/tl_scripts/texconfig-sys.sh | 8 +++++--- Build/source/texk/texlive/tl_scripts/texconfig.1 | 6 +++--- Build/source/texk/texlive/tl_scripts/texconfig.sh | 11 +++++++---- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog index b923dcfcd64..07e6f464249 100644 --- a/Build/source/texk/texlive/tl_scripts/ChangeLog +++ b/Build/source/texk/texlive/tl_scripts/ChangeLog @@ -1,3 +1,11 @@ +2014-07-13 Karl Berry + + * texconfig.sh, + * texconfig-sys.sh, + * texconfig-dialog.sh, + * texconfig.1: prepend directory of executable to $PATH. + (Testing with texconfig before propagating to updmap and fmtutil.) + 2014-05-09 Karl Berry * texlinks.sh (install_link): force destination for diff --git a/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh b/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh index bdf7ba202bc..dd0abbe9412 100755 --- a/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh +++ b/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh @@ -1,7 +1,8 @@ #!/bin/sh - -# TeX-Config version 3.0 -# Thomas Esser, te@dbs.uni-hannover.de. Public domain. +# $Id$ +# texconfig-dialog +# Originally written by Thomas Esser. Public domain. +# Now maintained as part of TeX Live; correspondence to tex-live@tug.org. # invoke the right shell: @@ -15,11 +16,14 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \ && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } unset RUNNING_BSH -export PATH - # 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 + # the version string version='$Id$' @@ -153,12 +157,15 @@ menuMain() cat <<-'eof' The interactive texconfig utility will be started now. Make sure your screen has at least 24 rows and 80 columns. If texconfig - crashes now, you can still set up your teTeX system using the + crashes now, you can still set up your TeX system using the batch mode of texconfig. Try 'texconfig help' to get a list of options. The interactive mode works best with a real vt100 terminal or inside an xterm window. + + More likely these days, you're better off using tlmgr. + See http://tug.org/texlive/tlmgr.html. eof termCtl readln diff --git a/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh b/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh index dd58513a6ea..06513209ff8 100755 --- a/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh +++ b/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh @@ -1,6 +1,5 @@ #!/bin/sh # $Id$ - # texconfig-sys: Thomas Esser, public domain. # wrapper script for texconfig with TEXMFVAR and TEXMFCONFIG set to @@ -16,11 +15,14 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \ && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } unset RUNNING_BSH -export PATH - # 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 + v=`kpsewhich -var-value TEXMFSYSVAR` c=`kpsewhich -var-value TEXMFSYSCONFIG` diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.1 b/Build/source/texk/texlive/tl_scripts/texconfig.1 index 8087f1e6dd1..ad31f31d9c7 100644 --- a/Build/source/texk/texlive/tl_scripts/texconfig.1 +++ b/Build/source/texk/texlive/tl_scripts/texconfig.1 @@ -1,4 +1,4 @@ -.TH texconfig 1 "August 2011" "TeX Live" "TeX Live" +.TH texconfig 1 "July 2014" "TeX Live" "TeX Live" .SH NAME texconfig \- configures teTeX or TeX Live .LP @@ -77,10 +77,10 @@ Remove .I config.PRINTERNAME .TP .B dvips mode -List available MetaFont modes. +List available Metafont modes. .TP .B dvips [-P PRINTER] mode MODE -Change the MetaFont mode to +Change the Metafont mode to .I MODE for .I PRINTER diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.sh b/Build/source/texk/texlive/tl_scripts/texconfig.sh index c9cc73c8305..3adcbfb5f2a 100755 --- a/Build/source/texk/texlive/tl_scripts/texconfig.sh +++ b/Build/source/texk/texlive/tl_scripts/texconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh - -# TeXConfig version 3.0 +# $Id$ +# texconfig version 3.0 # Originally written by Thomas Esser. Public domain. # Now maintained as part of TeX Live; correspondence to tex-live@tug.org. @@ -16,11 +16,14 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \ && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } unset RUNNING_BSH -export PATH - # 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 + # initializations... progname=texconfig -- cgit v1.2.3