summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-07-13 00:07:52 +0000
committerKarl Berry <karl@freefriends.org>2014-07-13 00:07:52 +0000
commitc7839af72f2ec9559c2ce37ebac7f11d81face8c (patch)
treee3ae18e7a416ea2e328bd8316449df8bb5cc07e1
parentb97a74010c1cbbc3aa94d19d0243e7b7eb05cad0 (diff)
sync with dev change
git-svn-id: svn://tug.org/texlive/trunk@34587 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/texconfig-dialog.sh21
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/texconfig-sys.sh10
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/texconfig.sh13
3 files changed, 28 insertions, 16 deletions
diff --git a/Master/texmf-dist/scripts/texlive/texconfig-dialog.sh b/Master/texmf-dist/scripts/texlive/texconfig-dialog.sh
index 965a7b1da41..30457b38a75 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig-dialog.sh
+++ b/Master/texmf-dist/scripts/texlive/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.sh 34586 2014-07-13 00:06:11Z karl $
+# 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,13 +16,16 @@ 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: texconfig-dialog.sh 29349 2013-03-12 00:01:41Z karl $'
+version='$Id: texconfig-dialog.sh 34586 2014-07-13 00:06:11Z karl $'
: ${PAGER=more}
progname=texconfig-dialog
@@ -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/Master/texmf-dist/scripts/texlive/texconfig-sys.sh b/Master/texmf-dist/scripts/texlive/texconfig-sys.sh
index 1ef6a7c944b..cf963fb9a52 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig-sys.sh
+++ b/Master/texmf-dist/scripts/texlive/texconfig-sys.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-# $Id: texconfig-sys.sh 29349 2013-03-12 00:01:41Z karl $
-
+# $Id: texconfig-sys.sh 34586 2014-07-13 00:06:11Z karl $
# 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/Master/texmf-dist/scripts/texlive/texconfig.sh b/Master/texmf-dist/scripts/texlive/texconfig.sh
index c9cc73c8305..b4e6da28c2a 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig.sh
+++ b/Master/texmf-dist/scripts/texlive/texconfig.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-
-# TeXConfig version 3.0
+# $Id: texconfig.sh 34586 2014-07-13 00:06:11Z karl $
+# 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,16 +16,19 @@ 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
# the version string
-version='$Id$'
+version='$Id: texconfig.sh 34586 2014-07-13 00:06:11Z karl $'
envVars="
AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS