summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am20
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in18
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/dvi2fax.sh (renamed from Build/source/texk/texlive/tl_scripts/dvi2fax.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/dvired.sh (renamed from Build/source/texk/texlive/tl_scripts/dvired.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/e2pall.pl (renamed from Build/source/texk/texlive/tl_scripts/e2pall.pl)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/fontinst.sh (renamed from Build/source/texk/texlive/tl_scripts/fontinst.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/kpsetool.sh (renamed from Build/source/texk/texlive/tl_scripts/kpsetool.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/kpsewhere.sh (renamed from Build/source/texk/texlive/tl_scripts/kpsewhere.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/ps2frag.sh (renamed from Build/source/texk/texlive/tl_scripts/ps2frag.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/pslatex.sh (renamed from Build/source/texk/texlive/tl_scripts/pslatex.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/rubibtex.sh (renamed from Build/source/texk/texlive/tl_scripts/rubibtex.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/rumakeindex.sh (renamed from Build/source/texk/texlive/tl_scripts/rumakeindex.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/texconfig-dialog.sh (renamed from Master/texmf-dist/scripts/texlive/texconfig-dialog.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh (renamed from Master/texmf-dist/scripts/texlive/texconfig-sys.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/texconfig.sh (renamed from Master/texmf-dist/scripts/texlive/texconfig.sh)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive-extra/texlinks.sh333
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am66
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in252
-rw-r--r--Build/source/texk/texlive/tl_scripts/README11
-rw-r--r--Build/source/texk/texlive/tl_scripts/scripts.lst16
l---------Master/bin/aarch64-linux/dvi2fax2
l---------Master/bin/aarch64-linux/dvired2
l---------Master/bin/aarch64-linux/e2pall2
l---------Master/bin/aarch64-linux/fontinst2
l---------Master/bin/aarch64-linux/kpsetool2
l---------Master/bin/aarch64-linux/kpsewhere2
l---------Master/bin/aarch64-linux/ps2frag2
l---------Master/bin/aarch64-linux/pslatex2
l---------Master/bin/aarch64-linux/rubibtex2
l---------Master/bin/aarch64-linux/rumakeindex2
l---------Master/bin/aarch64-linux/texconfig2
l---------Master/bin/aarch64-linux/texconfig-dialog2
l---------Master/bin/aarch64-linux/texconfig-sys2
l---------Master/bin/aarch64-linux/texlinks2
l---------Master/bin/amd64-freebsd/dvi2fax2
l---------Master/bin/amd64-freebsd/dvired2
l---------Master/bin/amd64-freebsd/e2pall2
l---------Master/bin/amd64-freebsd/fontinst2
l---------Master/bin/amd64-freebsd/kpsetool2
l---------Master/bin/amd64-freebsd/kpsewhere2
l---------Master/bin/amd64-freebsd/ps2frag2
l---------Master/bin/amd64-freebsd/pslatex2
l---------Master/bin/amd64-freebsd/rubibtex2
l---------Master/bin/amd64-freebsd/rumakeindex2
l---------Master/bin/amd64-freebsd/texconfig2
l---------Master/bin/amd64-freebsd/texconfig-dialog2
l---------Master/bin/amd64-freebsd/texconfig-sys2
l---------Master/bin/amd64-freebsd/texlinks2
l---------Master/bin/amd64-netbsd/dvi2fax2
l---------Master/bin/amd64-netbsd/dvired2
l---------Master/bin/amd64-netbsd/e2pall2
l---------Master/bin/amd64-netbsd/fontinst2
l---------Master/bin/amd64-netbsd/kpsetool2
l---------Master/bin/amd64-netbsd/kpsewhere2
l---------Master/bin/amd64-netbsd/ps2frag2
l---------Master/bin/amd64-netbsd/pslatex2
l---------Master/bin/amd64-netbsd/rubibtex2
l---------Master/bin/amd64-netbsd/rumakeindex2
l---------Master/bin/amd64-netbsd/texconfig2
l---------Master/bin/amd64-netbsd/texconfig-dialog2
l---------Master/bin/amd64-netbsd/texconfig-sys2
l---------Master/bin/amd64-netbsd/texlinks2
l---------Master/bin/armhf-linux/dvi2fax2
l---------Master/bin/armhf-linux/dvired2
l---------Master/bin/armhf-linux/e2pall2
l---------Master/bin/armhf-linux/fontinst2
l---------Master/bin/armhf-linux/kpsetool2
l---------Master/bin/armhf-linux/kpsewhere2
l---------Master/bin/armhf-linux/ps2frag2
l---------Master/bin/armhf-linux/pslatex2
l---------Master/bin/armhf-linux/rubibtex2
l---------Master/bin/armhf-linux/rumakeindex2
l---------Master/bin/armhf-linux/texconfig2
l---------Master/bin/armhf-linux/texconfig-dialog2
l---------Master/bin/armhf-linux/texconfig-sys2
l---------Master/bin/armhf-linux/texlinks2
l---------Master/bin/i386-cygwin/dvi2fax2
l---------Master/bin/i386-cygwin/dvired2
l---------Master/bin/i386-cygwin/e2pall2
l---------Master/bin/i386-cygwin/fontinst2
l---------Master/bin/i386-cygwin/kpsetool2
l---------Master/bin/i386-cygwin/kpsewhere2
l---------Master/bin/i386-cygwin/ps2frag2
l---------Master/bin/i386-cygwin/pslatex2
l---------Master/bin/i386-cygwin/rubibtex2
l---------Master/bin/i386-cygwin/rumakeindex2
l---------Master/bin/i386-cygwin/texconfig2
l---------Master/bin/i386-cygwin/texconfig-dialog2
l---------Master/bin/i386-cygwin/texconfig-sys2
l---------Master/bin/i386-cygwin/texlinks2
l---------Master/bin/i386-freebsd/dvi2fax2
l---------Master/bin/i386-freebsd/dvired2
l---------Master/bin/i386-freebsd/e2pall2
l---------Master/bin/i386-freebsd/fontinst2
l---------Master/bin/i386-freebsd/kpsetool2
l---------Master/bin/i386-freebsd/kpsewhere2
l---------Master/bin/i386-freebsd/ps2frag2
l---------Master/bin/i386-freebsd/pslatex2
l---------Master/bin/i386-freebsd/rubibtex2
l---------Master/bin/i386-freebsd/rumakeindex2
l---------Master/bin/i386-freebsd/texconfig2
l---------Master/bin/i386-freebsd/texconfig-dialog2
l---------Master/bin/i386-freebsd/texconfig-sys2
l---------Master/bin/i386-freebsd/texlinks2
l---------Master/bin/i386-linux/dvi2fax2
l---------Master/bin/i386-linux/dvired2
l---------Master/bin/i386-linux/e2pall2
l---------Master/bin/i386-linux/fontinst2
l---------Master/bin/i386-linux/kpsetool2
l---------Master/bin/i386-linux/kpsewhere2
l---------Master/bin/i386-linux/ps2frag2
l---------Master/bin/i386-linux/pslatex2
l---------Master/bin/i386-linux/rubibtex2
l---------Master/bin/i386-linux/rumakeindex2
l---------Master/bin/i386-linux/texconfig2
l---------Master/bin/i386-linux/texconfig-dialog2
l---------Master/bin/i386-linux/texconfig-sys2
l---------Master/bin/i386-linux/texlinks2
l---------Master/bin/i386-netbsd/dvi2fax2
l---------Master/bin/i386-netbsd/dvired2
l---------Master/bin/i386-netbsd/e2pall2
l---------Master/bin/i386-netbsd/fontinst2
l---------Master/bin/i386-netbsd/kpsetool2
l---------Master/bin/i386-netbsd/kpsewhere2
l---------Master/bin/i386-netbsd/ps2frag2
l---------Master/bin/i386-netbsd/pslatex2
l---------Master/bin/i386-netbsd/rubibtex2
l---------Master/bin/i386-netbsd/rumakeindex2
l---------Master/bin/i386-netbsd/texconfig2
l---------Master/bin/i386-netbsd/texconfig-dialog2
l---------Master/bin/i386-netbsd/texconfig-sys2
l---------Master/bin/i386-netbsd/texlinks2
l---------Master/bin/i386-solaris/dvi2fax2
l---------Master/bin/i386-solaris/dvired2
l---------Master/bin/i386-solaris/e2pall2
l---------Master/bin/i386-solaris/fontinst2
l---------Master/bin/i386-solaris/kpsetool2
l---------Master/bin/i386-solaris/kpsewhere2
l---------Master/bin/i386-solaris/ps2frag2
l---------Master/bin/i386-solaris/pslatex2
l---------Master/bin/i386-solaris/rubibtex2
l---------Master/bin/i386-solaris/rumakeindex2
l---------Master/bin/i386-solaris/texconfig2
l---------Master/bin/i386-solaris/texconfig-dialog2
l---------Master/bin/i386-solaris/texconfig-sys2
l---------Master/bin/i386-solaris/texlinks2
l---------Master/bin/x86_64-cygwin/dvi2fax2
l---------Master/bin/x86_64-cygwin/dvired2
l---------Master/bin/x86_64-cygwin/e2pall2
l---------Master/bin/x86_64-cygwin/fontinst2
l---------Master/bin/x86_64-cygwin/kpsetool2
l---------Master/bin/x86_64-cygwin/kpsewhere2
l---------Master/bin/x86_64-cygwin/ps2frag2
l---------Master/bin/x86_64-cygwin/pslatex2
l---------Master/bin/x86_64-cygwin/rubibtex2
l---------Master/bin/x86_64-cygwin/rumakeindex2
l---------Master/bin/x86_64-cygwin/texconfig2
l---------Master/bin/x86_64-cygwin/texconfig-dialog2
l---------Master/bin/x86_64-cygwin/texconfig-sys2
l---------Master/bin/x86_64-cygwin/texlinks2
l---------Master/bin/x86_64-darwin/dvi2fax2
l---------Master/bin/x86_64-darwin/dvired2
l---------Master/bin/x86_64-darwin/e2pall2
l---------Master/bin/x86_64-darwin/fontinst2
l---------Master/bin/x86_64-darwin/kpsetool2
l---------Master/bin/x86_64-darwin/kpsewhere2
l---------Master/bin/x86_64-darwin/ps2frag2
l---------Master/bin/x86_64-darwin/pslatex2
l---------Master/bin/x86_64-darwin/rubibtex2
l---------Master/bin/x86_64-darwin/rumakeindex2
l---------Master/bin/x86_64-darwin/texconfig2
l---------Master/bin/x86_64-darwin/texconfig-dialog2
l---------Master/bin/x86_64-darwin/texconfig-sys2
l---------Master/bin/x86_64-darwin/texlinks2
l---------Master/bin/x86_64-darwinlegacy/dvi2fax2
l---------Master/bin/x86_64-darwinlegacy/dvired2
l---------Master/bin/x86_64-darwinlegacy/e2pall2
l---------Master/bin/x86_64-darwinlegacy/fontinst2
l---------Master/bin/x86_64-darwinlegacy/kpsetool2
l---------Master/bin/x86_64-darwinlegacy/kpsewhere2
l---------Master/bin/x86_64-darwinlegacy/ps2frag2
l---------Master/bin/x86_64-darwinlegacy/pslatex2
l---------Master/bin/x86_64-darwinlegacy/rubibtex2
l---------Master/bin/x86_64-darwinlegacy/rumakeindex2
l---------Master/bin/x86_64-darwinlegacy/texconfig2
l---------Master/bin/x86_64-darwinlegacy/texconfig-dialog2
l---------Master/bin/x86_64-darwinlegacy/texconfig-sys2
l---------Master/bin/x86_64-darwinlegacy/texlinks2
l---------Master/bin/x86_64-linux/dvi2fax2
l---------Master/bin/x86_64-linux/dvired2
l---------Master/bin/x86_64-linux/e2pall2
l---------Master/bin/x86_64-linux/fontinst2
l---------Master/bin/x86_64-linux/kpsetool2
l---------Master/bin/x86_64-linux/kpsewhere2
l---------Master/bin/x86_64-linux/ps2frag2
l---------Master/bin/x86_64-linux/pslatex2
l---------Master/bin/x86_64-linux/rubibtex2
l---------Master/bin/x86_64-linux/rumakeindex2
l---------Master/bin/x86_64-linux/texconfig2
l---------Master/bin/x86_64-linux/texconfig-dialog2
l---------Master/bin/x86_64-linux/texconfig-sys2
l---------Master/bin/x86_64-linux/texlinks2
l---------Master/bin/x86_64-linuxmusl/dvi2fax2
l---------Master/bin/x86_64-linuxmusl/dvired2
l---------Master/bin/x86_64-linuxmusl/e2pall2
l---------Master/bin/x86_64-linuxmusl/fontinst2
l---------Master/bin/x86_64-linuxmusl/kpsetool2
l---------Master/bin/x86_64-linuxmusl/kpsewhere2
l---------Master/bin/x86_64-linuxmusl/ps2frag2
l---------Master/bin/x86_64-linuxmusl/pslatex2
l---------Master/bin/x86_64-linuxmusl/rubibtex2
l---------Master/bin/x86_64-linuxmusl/rumakeindex2
l---------Master/bin/x86_64-linuxmusl/texconfig2
l---------Master/bin/x86_64-linuxmusl/texconfig-dialog2
l---------Master/bin/x86_64-linuxmusl/texconfig-sys2
l---------Master/bin/x86_64-linuxmusl/texlinks2
l---------Master/bin/x86_64-solaris/dvi2fax2
l---------Master/bin/x86_64-solaris/dvired2
l---------Master/bin/x86_64-solaris/e2pall2
l---------Master/bin/x86_64-solaris/fontinst2
l---------Master/bin/x86_64-solaris/kpsetool2
l---------Master/bin/x86_64-solaris/kpsewhere2
l---------Master/bin/x86_64-solaris/ps2frag2
l---------Master/bin/x86_64-solaris/pslatex2
l---------Master/bin/x86_64-solaris/rubibtex2
l---------Master/bin/x86_64-solaris/rumakeindex2
l---------Master/bin/x86_64-solaris/texconfig2
l---------Master/bin/x86_64-solaris/texconfig-dialog2
l---------Master/bin/x86_64-solaris/texconfig-sys2
l---------Master/bin/x86_64-solaris/texlinks2
-rw-r--r--Master/texmf-dist/doc/tetex/TETEXDOC.pdfbin337756 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/tetex/teTeX-FAQ440
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/dvi2fax.sh (renamed from Master/texmf-dist/scripts/texlive/dvi2fax.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/dvired.sh (renamed from Master/texmf-dist/scripts/texlive/dvired.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/e2pall.pl (renamed from Master/texmf-dist/scripts/texlive/e2pall.pl)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/fontinst.sh (renamed from Master/texmf-dist/scripts/texlive/fontinst.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/kpsetool.sh (renamed from Master/texmf-dist/scripts/texlive/kpsetool.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/kpsewhere.sh (renamed from Master/texmf-dist/scripts/texlive/kpsewhere.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/ps2frag.sh (renamed from Master/texmf-dist/scripts/texlive/ps2frag.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/pslatex.sh (renamed from Master/texmf-dist/scripts/texlive/pslatex.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/rubibtex.sh (renamed from Master/texmf-dist/scripts/texlive/rubibtex.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/rumakeindex.sh (renamed from Master/texmf-dist/scripts/texlive/rumakeindex.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/texconfig-dialog.sh (renamed from Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/texconfig-sys.sh (renamed from Build/source/texk/texlive/tl_scripts/texconfig-sys.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/texconfig.sh (renamed from Build/source/texk/texlive/tl_scripts/texconfig.sh)0
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/texlinks.sh (renamed from Build/source/texk/texlive/tl_scripts/texlinks.sh)0
-rwxr-xr-xMaster/tlpkg/bin/tl-check-wrapper-consistency3
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tetex.tlpsrc71
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc73
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc33
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc3
253 files changed, 718 insertions, 1043 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 904bf639186..2a11c0e17ce 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -74,11 +74,25 @@ texmf_shell_scripts = \
simpdftex/simpdftex \
texlive-extra/allcm.sh \
texlive-extra/allneeded.sh \
+ texlive-extra/dvi2fax.sh \
+ texlive-extra/dvired.sh \
+ texlive-extra/fontinst.sh \
+ texlive-extra/kpsetool.sh \
+ texlive-extra/kpsewhere.sh \
+ texlive-extra/ps2frag.sh \
+ texlive-extra/pslatex.sh \
+ texlive-extra/rubibtex.sh \
+ texlive-extra/rumakeindex.sh \
+ texlive-extra/texconfig-dialog.sh \
+ texlive-extra/texconfig-sys.sh \
+ texlive-extra/texconfig.sh \
+ texlive-extra/texlinks.sh \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
typeoutfileinfo/typeoutfileinfo.sh \
wordcount/wordcount.sh
+
texmf_other_scripts = \
a2ping/a2ping.pl \
accfonts/mkt1font \
@@ -206,6 +220,7 @@ texmf_other_scripts = \
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
+ texlive-extra/e2pall.pl \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -218,6 +233,7 @@ texmf_other_scripts = \
webquiz/webquiz.py \
xindex/xindex.lua \
yplan/yplan
+
texmf_context_scripts = \
context/stubs/unix/context \
context/stubs/unix/contextjit \
@@ -242,10 +258,14 @@ bin_links = \
cluttex:clxelatex \
cluttex:cllualatex \
epstopdf:repstopdf \
+ fmtutil:mktexfmt \
+ kpsetool:kpsexpand \
+ kpsetool:kpsepath \
mktexlsr:texhash \
pdfcrop:rpdfcrop \
texdef:latexdef
+#
# The idea is to install the scripts themselves in texmf*/scripts, and
# have bin/arch/foo be a symlink to, say,
# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 806dbdf0b60..6f37c9b9a9e 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -238,6 +238,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
DISTCLEANFILES = scripts-list
+#
# The idea is to install the scripts themselves in texmf*/scripts, and
# have bin/arch/foo be a symlink to, say,
# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
@@ -286,6 +287,19 @@ texmf_shell_scripts = \
simpdftex/simpdftex \
texlive-extra/allcm.sh \
texlive-extra/allneeded.sh \
+ texlive-extra/dvi2fax.sh \
+ texlive-extra/dvired.sh \
+ texlive-extra/fontinst.sh \
+ texlive-extra/kpsetool.sh \
+ texlive-extra/kpsewhere.sh \
+ texlive-extra/ps2frag.sh \
+ texlive-extra/pslatex.sh \
+ texlive-extra/rubibtex.sh \
+ texlive-extra/rumakeindex.sh \
+ texlive-extra/texconfig-dialog.sh \
+ texlive-extra/texconfig-sys.sh \
+ texlive-extra/texconfig.sh \
+ texlive-extra/texlinks.sh \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
@@ -419,6 +433,7 @@ texmf_other_scripts = \
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
+ texlive-extra/e2pall.pl \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -451,6 +466,9 @@ bin_links = \
cluttex:clxelatex \
cluttex:cllualatex \
epstopdf:repstopdf \
+ fmtutil:mktexfmt \
+ kpsetool:kpsexpand \
+ kpsetool:kpsepath \
mktexlsr:texhash \
pdfcrop:rpdfcrop \
texdef:latexdef
diff --git a/Build/source/texk/texlive/tl_scripts/dvi2fax.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvi2fax.sh
index fdfa83211eb..fdfa83211eb 100755
--- a/Build/source/texk/texlive/tl_scripts/dvi2fax.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvi2fax.sh
diff --git a/Build/source/texk/texlive/tl_scripts/dvired.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvired.sh
index 4eb3586119d..4eb3586119d 100755
--- a/Build/source/texk/texlive/tl_scripts/dvired.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvired.sh
diff --git a/Build/source/texk/texlive/tl_scripts/e2pall.pl b/Build/source/texk/texlive/linked_scripts/texlive-extra/e2pall.pl
index 2997f8b1102..2997f8b1102 100755
--- a/Build/source/texk/texlive/tl_scripts/e2pall.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/e2pall.pl
diff --git a/Build/source/texk/texlive/tl_scripts/fontinst.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/fontinst.sh
index 7d1271517ad..7d1271517ad 100755
--- a/Build/source/texk/texlive/tl_scripts/fontinst.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/fontinst.sh
diff --git a/Build/source/texk/texlive/tl_scripts/kpsetool.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsetool.sh
index 463097fd4a9..463097fd4a9 100755
--- a/Build/source/texk/texlive/tl_scripts/kpsetool.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsetool.sh
diff --git a/Build/source/texk/texlive/tl_scripts/kpsewhere.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsewhere.sh
index 51088ee80d6..51088ee80d6 100755
--- a/Build/source/texk/texlive/tl_scripts/kpsewhere.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsewhere.sh
diff --git a/Build/source/texk/texlive/tl_scripts/ps2frag.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/ps2frag.sh
index b8e673be087..b8e673be087 100755
--- a/Build/source/texk/texlive/tl_scripts/ps2frag.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/ps2frag.sh
diff --git a/Build/source/texk/texlive/tl_scripts/pslatex.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/pslatex.sh
index 4badef0ec12..4badef0ec12 100755
--- a/Build/source/texk/texlive/tl_scripts/pslatex.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/pslatex.sh
diff --git a/Build/source/texk/texlive/tl_scripts/rubibtex.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/rubibtex.sh
index 373e6e1194d..373e6e1194d 100755
--- a/Build/source/texk/texlive/tl_scripts/rubibtex.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/rubibtex.sh
diff --git a/Build/source/texk/texlive/tl_scripts/rumakeindex.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/rumakeindex.sh
index b7b0c072729..b7b0c072729 100755
--- a/Build/source/texk/texlive/tl_scripts/rumakeindex.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/rumakeindex.sh
diff --git a/Master/texmf-dist/scripts/texlive/texconfig-dialog.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-dialog.sh
index baa46bbecb5..baa46bbecb5 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig-dialog.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-dialog.sh
diff --git a/Master/texmf-dist/scripts/texlive/texconfig-sys.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh
index cf963fb9a52..cf963fb9a52 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig-sys.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh
diff --git a/Master/texmf-dist/scripts/texlive/texconfig.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig.sh
index 6448580dd36..6448580dd36 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig.sh
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig.sh
diff --git a/Build/source/texk/texlive/linked_scripts/texlive-extra/texlinks.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texlinks.sh
new file mode 100755
index 00000000000..91540eac147
--- /dev/null
+++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texlinks.sh
@@ -0,0 +1,333 @@
+#!/bin/sh
+# $Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $
+
+# Thomas Esser, 1999, 2002, 2003. public domain.
+
+# texlinks: script to maintain symlinks from format to engine. Interprets
+# the lines given in fmtutil.cnf.
+
+# History:
+# (Further changes in ChangeLog.)
+# Tue Oct 9 14:23:01 BST 2007
+# Added unlink option (-u) to aid OpenBSD package uninstall
+# Edd Barrett <vext01@gmail.com>
+# Sun Aug 28 21:41:06 CEST 2005
+# remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
+# Fr Apr 8 19:15:05 CEST 2005
+# cleanup now has an argument for the return code
+# So Mar 27 18:52:06 CEST 2005
+# honor $TMPDIR, $TEMP and $TMP, not just $TMP
+# Mon May 10 20:52:48 CEST 2004
+# kpseaccess instead of access
+# Thu Dec 25 22:11:53 CET 2003, te:
+# add version string
+# Tue Apr 9 22:46:34 CEST 2002, te:
+# do not create symlinks for cont-??, metafun and mptopdf
+
+test -f /bin/sh5 && test -z "$RUNNING_SH5" \
+ && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+ && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
+unset RUNNING_SH5
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+ && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+ && { 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+"$@"}'='"$@"'
+
+version='$Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $'
+progname=texlinks
+cnf=fmtutil.cnf # name of the config file
+
+usage='Usage: texlinks [OPTION]... [DIRECTORY]...
+
+Create symbolic links format -> engine according to fmtutil setup.
+
+Mandatory arguments to long options are mandatory for short options too.
+ -e, --exeext EXT append EXT to symlink targets (default: none)
+ -f, --cnffile FILE use FILE as config file (default: fmtutil.cnf)
+ -m, --multiplatform operate in all platform specific directories
+ (default: operate only in directory for this platform)
+ -q, --quiet silently skip existing scripts / binaries
+ (default: issue warning)
+ -s, --silent same as -q
+ -u, --unlink remove symlinks created by texlinks
+ -v, --verbose enable verbose messages (default: off)
+ -h, --help show this help text
+ --version show version string
+
+The DIRECTORY arguments are an optional list of directories in which to
+operate. If no directories are specified and --multiplatform is
+likewise not specified, the directory of this script itself is used.
+With --multiplatform, all child dirs of an upper-level bin/ dir are used.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+'
+
+# print `errmsg' to stderr and exit with error code 1:
+abort() { errmsg "texlinks: $1."; cleanup 1; }
+
+# error message to stderr:
+errmsg() { echo "$@" >&2; }
+
+# give message to stderr only if "verbose" mode is on:
+verbose_echo() { $verbose && errmsg "$@"; }
+
+# in verbose mode: show command that is executed:
+verbose_do() { verbose_echo "$@"; "$@"; }
+
+# clean up the temp area and exit with proper exit status:
+cleanup()
+{
+ rc=$1
+ $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
+ && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
+ exit $rc
+}
+
+###############################################################################
+# setupTmpDir()
+# set up a temp directory and a trap to remove it
+###############################################################################
+setupTmpDir()
+{
+ $needsCleanup && return
+
+ trap 'cleanup 1' 1 2 3 7 13 15
+ needsCleanup=true
+ (umask 077; mkdir "$tmpdir") \
+ || abort "could not create directory \`$tmpdir'"
+}
+
+
+# search a binary along $PATH:
+check_for_binary()
+{
+ testbin=$1
+ set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
+ for i
+ do
+ if [ -x "$i/$testbin" ]; then
+ echo "$i/$testbin"
+ return 0
+ fi
+ done
+ return 1
+}
+
+
+###############################################################################
+# install_link(dest src)
+# create a symlink like ln -s dest src, but make sure that src is not
+# an existing binary, possibly adding the executable extension if
+# passed on the command.
+###############################################################################
+install_link()
+{
+ # make symlink src -> dest
+ dest=$1; src=$2
+
+ case $src in
+ */mf)
+ if test "$dest" = mf-nowin; then
+ if test -f $selfautoloc/mfw; then
+ dest=mfw # name for windows-enabled mf, once upon a time
+ verbose_echo "both mfw and mf-nowin exists, $src linked to $dest"
+ fi
+ if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
+ # have both mf and mf-nowin binaries. no link.
+ verbose_echo "skipped metafont symlink $src -> $dest (special case)"
+ return
+ fi
+ fi
+ ;;
+ esac
+
+ # append .exe if supplied (for cygwin).
+ test -n "$exeext" && dest="$dest$exeext"
+
+ case $src in
+ */cont-??|*/mptopdf)
+ # context includes wrapper scripts that create/run these.
+ verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
+ ;;
+ *)
+ test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
+ rm -f "$src"
+
+ if test -f "$src"; then
+ if $silent; then :; else
+ # i.e., the rm failed.
+ errmsg "install_link $src -> $dest failed: file already exists."
+ fi
+ else
+ if echo "$src" | grep '/pdfcsplain$' >/dev/null; then
+ # at p.olsak insistence: we have three pdfcsplain entries in
+ # fmtutil.cnf with different engines, but the executable link
+ # must point to pdftex.
+ verbose_echo "forcing pdfcsplain destination to be pdftex"
+ dest=pdftex$exeext
+ fi
+ verbose_do ln -s "$dest" "$src"
+ fi
+ ;;
+ esac
+}
+
+###############################################################################
+# search_symlinkdir()
+# look if $PATH has only symlinks to the real binaries and find that
+# directory. Also check if this directory is writable.
+###############################################################################
+search_symlinkdir()
+{
+ kpsewhich=`check_for_binary kpsewhich`
+ test -z "$kpsewhich" && return 1
+ symlinkdir=`echo $kpsewhich | sed 's@/*kpsewhich$@@'`
+ kpseaccess -w "$symlinkdir" || return 1
+ touch "$symlinkdir/tl$$"
+ if test -f "$selfautoloc/tl$$"; then
+ rm -f "$symlinkdir/tl$$"
+ return 1
+ else
+ rm -f "$symlinkdir/tl$$"
+ return 0
+ fi
+}
+
+###############################################################################
+# upd_symlinkdir()
+# if $PATH has only symlinks to the real binaries, update that directory
+# that holds the symlinks
+###############################################################################
+upd_symlinkdir()
+{
+ search_symlinkdir || return 0
+ for i in `sed 's@ .*@@' cnf_file_ln.$$`; do
+ install_link "$selfautoloc/$i" "$symlinkdir/$i"
+ done
+}
+
+###############################################################################
+# rm_link()
+# Delete a previously installed link
+###############################################################################
+rm_link()
+{
+ link=$1;
+ if test -e $link; then
+ if test -h $link; then
+ verbose_do rm -Rf $link
+ else
+ verbose_echo "kept $link, since not a symlink"
+ fi
+ else
+ verbose_echo "skipped $link, non-existent"
+ fi
+}
+
+###############################################################################
+# main()
+# parse commandline arguments, initialize variables,
+# switch into temp. direcrory, execute desired command
+###############################################################################
+main()
+{
+ cnf_file= # global variable: full name of the config file
+ dirs=
+ needsCleanup=false
+
+ exeext=
+ multiplatform=false
+ verbose=false
+ unlink=false
+ silent=false
+ thisdir=`pwd`
+ : ${KPSE_DOT=$thisdir}; export KPSE_DOT
+ selfautoloc=`kpsewhich --expand-var='$SELFAUTOLOC'`
+ while
+ case $1 in
+ --h*|-h)
+ echo "$usage"; exit 0;;
+ --version)
+ echo "$progname version $version"; exit 0;;
+ --cnffile|-f)
+ shift; cnf_file=$1;;
+ --e*|-e) shift; exeext=$1;;
+ --m*|-m) multiplatform=true;;
+ --s*|-s|--q*|-q) silent=true;;
+ --u*|-u) unlink=true;;
+ --v*|-v) verbose=true;;
+ -*) errmsg "fmtutil: unknown option \`$1' ignored.";;
+ *) break;;
+ esac
+ do test $# -gt 0 && shift; done
+ dirs="$*"
+
+ # if no cnf_file from command-line, look it up with kpsewhich:
+ test -z "$cnf_file" && cnf_file=`kpsewhich --format='web2c files' $cnf`
+ test -f "$cnf_file" || abort "config file \`$cnf' not found"
+
+
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$
+ setupTmpDir
+ cd "$tmpdir" || cleanup 1
+
+ sed '/^[ ]*#/d; /^[ ]*$/d' $cnf_file \
+ | awk '{print $1, $2}' > cnf_file_ln.$$
+
+ if test -z "$dirs"; then
+ if test $multiplatform = true; then
+ case $selfautoloc in
+ */bin) dirs=$selfautoloc;;
+ *) parent=`kpsewhich --expand-var='$SELFAUTODIR'`
+ dirs=`find $parent -type f -name kpsewhich -print \
+ | sed 's@/kpsewhich$@@'`;;
+ esac
+ else
+ dirs=$selfautoloc
+ fi
+ fi
+
+ for d in $dirs; do
+ kpseaccess -w $d \
+ || { errmsg "$d: no write permissions. Skipping..."; continue; }
+ # cnf_file_ln.$$ has lines with "format engine" pairs
+ set x `cat cnf_file_ln.$$`; shift
+ while test $# != 0; do
+ fmt=$1; engine=$2; shift; shift
+
+ # Some broken shells destroy the positional arguments when calling a
+ # shellfunction. Therefore, we save and restore them "by hand" in the
+ # main_args_while variable.
+ main_args_while="$@"
+
+ test "x$fmt" = "x$engine" && continue
+ if test -f "$d/$engine$exeext"; then
+ case $unlink in
+ true)
+ rm_link "$d/$fmt";;
+ *)
+ install_link "$engine" "$d/$fmt";;
+ esac
+ else
+ verbose_echo "skipped $d/$engine, engine does not exist"
+ fi
+
+ # restore positional arguments:
+ set x $main_args_while; shift
+
+ done
+ done
+ upd_symlinkdir
+}
+
+main ${1+"$@"}
+
+# set successful return code
+cleanup 0
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index 4581b105c17..4fb8bc69f1b 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -1,54 +1,11 @@
## $Id$
## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/
##
-## Copyright 2013-2019 Karl Berry <tex-live@tug.org>
+## Copyright 2013-2020 Karl Berry <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
-## Build lists of scripts.
-##
-scripts-list: Makefile
- @echo "Create $@"
- @echo "tl_scripts='" >$@
- @for f in $(dist_texmf_SCRIPTS); do echo "$$f"; done >>$@
- @echo "'" >>$@
- cmp -s $(srcdir)/scripts.lst $@ || cp -f $@ $(srcdir)/scripts.lst
-
-if MAINTAINER_MODE
-all-local: scripts-list
-else !MAINTAINER_MODE
-all-local:
-endif !MAINTAINER_MODE
-
-DISTCLEANFILES = scripts-list
-
-EXTRA_DIST = scripts.lst
-
-# These first variable definitions are what scripts_links.am requires.
-perl_scripts = e2pall
-sh_scripts = \
- dvi2fax \
- dvired \
- fontinst \
- kpsetool \
- kpsewhere \
- ps2frag \
- pslatex \
- rubibtex \
- rumakeindex \
- texconfig-dialog \
- texconfig-sys \
- texconfig \
- texlinks
-nodist_bin_SCRIPTS =
-scriptsdir = texmf-dist/scripts/texlive
-#
-include $(top_srcdir)/../../am/script_links.am
-#
-texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
-
-install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links
-uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links
+install-data-hook: install-man1-links
+uninstall-hook: uninstall-man1-links
dist_man_MANS = \
allcm.1 \
@@ -75,14 +32,6 @@ dist_man_MANS = \
updmap.1 \
updmap.cfg.5
-bin_links = \
- allcm:allec \
- fmtutil:mktexfmt \
- kpsetool:kpsexpand \
- kpsetool:kpsepath
-
-include $(top_srcdir)/../../am/bin_links.am
-
man1_links = \
fmtutil:fmtutil-sys \
kpsetool:kpsexpand \
@@ -106,7 +55,7 @@ dist_web2c_DATA = fmtutil.cnf
## handwritten material. But don't actually update updmap/fmtutil.1,
## since we don't want to require help2man for an install. Leave that
## to be done by hand (see tlpkg/doc/releng.txt).
-EXTRA_DIST += updmap.help2man fmtutil.help2man
+EXTRA_DIST = updmap.help2man fmtutil.help2man
.PHONY: xmans xupdmap.1 xfmtutil.1
xmans: xupdmap.1 xfmtutil.1
Master_dir = $(top_srcdir)/../../../../Master
@@ -122,7 +71,6 @@ xfmtutil.1: fmtutil.help2man $(tl_scripts_dir)/fmtutil.pl
$(tl_scripts_dir)/fmtutil.pl >/tmp/$@
groff -mandoc -Thtml /tmp/$@ >/tmp/$@.html
-
##
## This target is invoked by the top-level make,
.PHONY: run-texlinks
@@ -146,9 +94,3 @@ endif !WIN32
$(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf
$(DESTDIR)$(web2cdir)/fmtutil.cnf:
$(MAKE) $(AM_MAKEFLAGS) install
-
-##
-## This target is invoked by check-wrapper-consistency (run from cron).
-.PHONY: echo-shell-scripts
-echo-shell-scripts:
- @echo $(sh_scripts)
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 73356bca87d..a6590dbaf55 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -87,7 +87,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers)
subdir = tl_scripts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
@@ -96,8 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(dist_texconfig_SCRIPTS) \
- $(dist_texmf_SCRIPTS) $(dist_texconfig_DATA) \
- $(dist_web2c_DATA) $(am__DIST_COMMON)
+ $(dist_texconfig_DATA) $(dist_web2c_DATA) $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -128,12 +126,10 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" \
"$(DESTDIR)$(web2cdir)"
-SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \
- $(nodist_bin_SCRIPTS)
+SCRIPTS = $(dist_texconfig_SCRIPTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -160,9 +156,7 @@ MANS = $(dist_man_MANS)
DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
- $(top_srcdir)/../../am/bin_links.am \
- $(top_srcdir)/../../am/man1_links.am \
- $(top_srcdir)/../../am/script_links.am ChangeLog README
+ $(top_srcdir)/../../am/man1_links.am ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -251,36 +245,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DISTCLEANFILES = scripts-list
-EXTRA_DIST = scripts.lst $(top_builddir)/../../build-aux/relpath \
- updmap.help2man fmtutil.help2man
-
-# These first variable definitions are what scripts_links.am requires.
-perl_scripts = e2pall
-sh_scripts = \
- dvi2fax \
- dvired \
- fontinst \
- kpsetool \
- kpsewhere \
- ps2frag \
- pslatex \
- rubibtex \
- rumakeindex \
- texconfig-dialog \
- texconfig-sys \
- texconfig \
- texlinks
-
-nodist_bin_SCRIPTS = $(am__append_1)
-scriptsdir = texmf-dist/scripts/texlive
-all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
-#
-#
-texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
dist_man_MANS = \
allcm.1 \
allec.1 \
@@ -306,12 +270,6 @@ dist_man_MANS = \
updmap.1 \
updmap.cfg.5
-bin_links = \
- allcm:allec \
- fmtutil:mktexfmt \
- kpsetool:kpsexpand \
- kpsetool:kpsepath
-
man1_links = \
fmtutil:fmtutil-sys \
kpsetool:kpsexpand \
@@ -326,6 +284,7 @@ dist_texconfig_SCRIPTS = tcfmgr
dist_texconfig_DATA = tcfmgr.map
web2cdir = $(datarootdir)/texmf-dist/web2c
dist_web2c_DATA = fmtutil.cnf
+EXTRA_DIST = updmap.help2man fmtutil.help2man
Master_dir = $(top_srcdir)/../../../../Master
tl_scripts_dir = $(Master_dir)/texmf-dist/scripts/texlive
#
@@ -338,7 +297,7 @@ run_texlinks = $(texlinks_prog) -v \
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -358,7 +317,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
-$(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
+$(top_srcdir)/../../am/man1_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -403,76 +362,6 @@ uninstall-dist_texconfigSCRIPTS:
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
dir='$(DESTDIR)$(texconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_texmfSCRIPTS: $(dist_texmf_SCRIPTS)
- @$(NORMAL_INSTALL)
- @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n' \
- -e 'h;s|.*|.|' \
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
- if (++n[d] == $(am__install_max)) { \
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
- else { print "f", d "/" $$4, $$1 } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-dist_texmfSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir)
-install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
- @$(NORMAL_INSTALL)
- @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n' \
- -e 'h;s|.*|.|' \
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
- if (++n[d] == $(am__install_max)) { \
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
- else { print "f", d "/" $$4, $$1 } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-nodist_binSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
install-man1: $(dist_man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -643,9 +532,9 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local
+all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
+ for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -674,7 +563,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -700,15 +588,15 @@ info: info-am
info-am:
install-data-am: install-dist_texconfigDATA \
- install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
- install-dist_web2cDATA install-man
+ install-dist_texconfigSCRIPTS install-dist_web2cDATA \
+ install-man
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-nodist_binSCRIPTS
+install-exec-am:
install-html: install-html-am
@@ -747,111 +635,35 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-dist_texconfigDATA \
- uninstall-dist_texconfigSCRIPTS uninstall-dist_texmfSCRIPTS \
- uninstall-dist_web2cDATA uninstall-man \
- uninstall-nodist_binSCRIPTS
+ uninstall-dist_texconfigSCRIPTS uninstall-dist_web2cDATA \
+ uninstall-man
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1 uninstall-man5
.MAKE: install-am install-data-am install-strip uninstall-am
-.PHONY: all all-am all-local check check-am clean clean-generic \
- cscopelist-am ctags-am distclean distclean-generic distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-hook \
- install-dist_texconfigDATA install-dist_texconfigSCRIPTS \
- install-dist_texmfSCRIPTS install-dist_web2cDATA install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man1 install-man5 install-nodist_binSCRIPTS \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am uninstall-dist_texconfigDATA \
- uninstall-dist_texconfigSCRIPTS uninstall-dist_texmfSCRIPTS \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-hook install-dist_texconfigDATA \
+ install-dist_texconfigSCRIPTS install-dist_web2cDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-man1 install-man5 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-dist_texconfigDATA uninstall-dist_texconfigSCRIPTS \
uninstall-dist_web2cDATA uninstall-hook uninstall-man \
- uninstall-man1 uninstall-man5 uninstall-nodist_binSCRIPTS
+ uninstall-man1 uninstall-man5
.PRECIOUS: Makefile
-scripts-list: Makefile
- @echo "Create $@"
- @echo "tl_scripts='" >$@
- @for f in $(dist_texmf_SCRIPTS); do echo "$$f"; done >>$@
- @echo "'" >>$@
- cmp -s $(srcdir)/scripts.lst $@ || cp -f $@ $(srcdir)/scripts.lst
-
-@MAINTAINER_MODE_TRUE@all-local: scripts-list
-@MAINTAINER_MODE_FALSE@all-local:
-.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
- install-links uninstall-links
-@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(AM_V_GEN)$(LN_S) $(runscript) $@
-
-install-lua-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
-
-install-perl-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
-
-install-shell-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
-
-install-sh-links:
-@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
-
-# We support native builds, multiplatform or not, as well as distro builds.
-install-links:
- @relpath="$(top_srcdir)/../../build-aux/relpath"; \
- test -r $$relpath || { \
- echo 'script_links.am:install-links: could not find relpath script'; \
- exit 1; \
- }; \
- REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
- if test -z "$$REL"; then \
- echo 'script_links.am:install_links: unable to compute relative path for linked $(TYPE) scripts' >&2; \
- exit 1; \
- fi; \
- cd $(DESTDIR)$(bindir) && \
- for f in $($(TYPE)_scripts); do \
- rm -f $$f; \
- if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
- else echo " LINK $$f"; fi; \
- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
- done
-
-uninstall-links:
-@WIN32_FALSE@ @for f in $(all_scripts) $(sh_scripts); do \
-@WIN32_FALSE@ echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-@WIN32_FALSE@ done
-
-install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links
-uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links
-
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
-.PHONY: install-bin-links uninstall-bin-links
-
-install-bin-links:
-@WIN32_FALSE@ $(MKDIR_P) $(DESTDIR)$(bindir)
-@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
-@WIN32_FALSE@ for s in $(bin_links); do \
-@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
-@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
-@WIN32_FALSE@ rm -f $$link; \
-@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
-@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
-@WIN32_FALSE@ done
-
-uninstall-bin-links:
-@WIN32_FALSE@ @for s in $(bin_links); do \
-@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
-@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
-@WIN32_FALSE@ done
+install-data-hook: install-man1-links
+uninstall-hook: uninstall-man1-links
.PHONY: install-man1-links uninstall-man1-links
install-man1-links:
@@ -891,10 +703,6 @@ $(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf
$(DESTDIR)$(web2cdir)/fmtutil.cnf:
$(MAKE) $(AM_MAKEFLAGS) install
-.PHONY: echo-shell-scripts
-echo-shell-scripts:
- @echo $(sh_scripts)
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/Build/source/texk/texlive/tl_scripts/README b/Build/source/texk/texlive/tl_scripts/README
index 46384f54ef8..18a509b4f8b 100644
--- a/Build/source/texk/texlive/tl_scripts/README
+++ b/Build/source/texk/texlive/tl_scripts/README
@@ -1,8 +1,7 @@
$Id$
-Copyright 2013 TeX Users Group.
-You may freely use, modify and/or distribute this file.
+Public domain.
-This directory contains scripts which originated in teTeX, but with
-teTeX's demise, are now maintained as part of TeX Live. Some have been
-significantly or completely rewritten from the teTeX versions; most
-notably, updmap and fmtutil are now implemented in Perl.
+This directory contains documentation for scripts which are maintained
+as part of TeX Live. The scripts themselves are maintained under Master:
+Master/texmf-dist/scripts/texlive/
+Master/texmf-dist/scripts/texlive-extra
diff --git a/Build/source/texk/texlive/tl_scripts/scripts.lst b/Build/source/texk/texlive/tl_scripts/scripts.lst
deleted file mode 100644
index da82d9da8dc..00000000000
--- a/Build/source/texk/texlive/tl_scripts/scripts.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-tl_scripts='
-e2pall.pl
-dvi2fax.sh
-dvired.sh
-fontinst.sh
-kpsetool.sh
-kpsewhere.sh
-ps2frag.sh
-pslatex.sh
-rubibtex.sh
-rumakeindex.sh
-texconfig-dialog.sh
-texconfig-sys.sh
-texconfig.sh
-texlinks.sh
-'
diff --git a/Master/bin/aarch64-linux/dvi2fax b/Master/bin/aarch64-linux/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/aarch64-linux/dvi2fax
+++ b/Master/bin/aarch64-linux/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/dvired b/Master/bin/aarch64-linux/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/aarch64-linux/dvired
+++ b/Master/bin/aarch64-linux/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/e2pall b/Master/bin/aarch64-linux/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/aarch64-linux/e2pall
+++ b/Master/bin/aarch64-linux/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/fontinst b/Master/bin/aarch64-linux/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/aarch64-linux/fontinst
+++ b/Master/bin/aarch64-linux/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/kpsetool b/Master/bin/aarch64-linux/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/aarch64-linux/kpsetool
+++ b/Master/bin/aarch64-linux/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/kpsewhere b/Master/bin/aarch64-linux/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/aarch64-linux/kpsewhere
+++ b/Master/bin/aarch64-linux/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/ps2frag b/Master/bin/aarch64-linux/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/aarch64-linux/ps2frag
+++ b/Master/bin/aarch64-linux/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/pslatex b/Master/bin/aarch64-linux/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/aarch64-linux/pslatex
+++ b/Master/bin/aarch64-linux/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/rubibtex b/Master/bin/aarch64-linux/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/aarch64-linux/rubibtex
+++ b/Master/bin/aarch64-linux/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/rumakeindex b/Master/bin/aarch64-linux/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/aarch64-linux/rumakeindex
+++ b/Master/bin/aarch64-linux/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/texconfig b/Master/bin/aarch64-linux/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/aarch64-linux/texconfig
+++ b/Master/bin/aarch64-linux/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/texconfig-dialog b/Master/bin/aarch64-linux/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/aarch64-linux/texconfig-dialog
+++ b/Master/bin/aarch64-linux/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/texconfig-sys b/Master/bin/aarch64-linux/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/aarch64-linux/texconfig-sys
+++ b/Master/bin/aarch64-linux/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/aarch64-linux/texlinks b/Master/bin/aarch64-linux/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/aarch64-linux/texlinks
+++ b/Master/bin/aarch64-linux/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/dvi2fax b/Master/bin/amd64-freebsd/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/amd64-freebsd/dvi2fax
+++ b/Master/bin/amd64-freebsd/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/dvired b/Master/bin/amd64-freebsd/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/amd64-freebsd/dvired
+++ b/Master/bin/amd64-freebsd/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/e2pall b/Master/bin/amd64-freebsd/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/amd64-freebsd/e2pall
+++ b/Master/bin/amd64-freebsd/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/fontinst b/Master/bin/amd64-freebsd/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/amd64-freebsd/fontinst
+++ b/Master/bin/amd64-freebsd/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/kpsetool b/Master/bin/amd64-freebsd/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/amd64-freebsd/kpsetool
+++ b/Master/bin/amd64-freebsd/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/kpsewhere b/Master/bin/amd64-freebsd/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/amd64-freebsd/kpsewhere
+++ b/Master/bin/amd64-freebsd/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/ps2frag b/Master/bin/amd64-freebsd/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/amd64-freebsd/ps2frag
+++ b/Master/bin/amd64-freebsd/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/pslatex b/Master/bin/amd64-freebsd/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/amd64-freebsd/pslatex
+++ b/Master/bin/amd64-freebsd/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/rubibtex b/Master/bin/amd64-freebsd/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/amd64-freebsd/rubibtex
+++ b/Master/bin/amd64-freebsd/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/rumakeindex b/Master/bin/amd64-freebsd/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/amd64-freebsd/rumakeindex
+++ b/Master/bin/amd64-freebsd/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/texconfig b/Master/bin/amd64-freebsd/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/amd64-freebsd/texconfig
+++ b/Master/bin/amd64-freebsd/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/texconfig-dialog b/Master/bin/amd64-freebsd/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/amd64-freebsd/texconfig-dialog
+++ b/Master/bin/amd64-freebsd/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/texconfig-sys b/Master/bin/amd64-freebsd/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/amd64-freebsd/texconfig-sys
+++ b/Master/bin/amd64-freebsd/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/texlinks b/Master/bin/amd64-freebsd/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/amd64-freebsd/texlinks
+++ b/Master/bin/amd64-freebsd/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/dvi2fax b/Master/bin/amd64-netbsd/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/amd64-netbsd/dvi2fax
+++ b/Master/bin/amd64-netbsd/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/dvired b/Master/bin/amd64-netbsd/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/amd64-netbsd/dvired
+++ b/Master/bin/amd64-netbsd/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/e2pall b/Master/bin/amd64-netbsd/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/amd64-netbsd/e2pall
+++ b/Master/bin/amd64-netbsd/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/fontinst b/Master/bin/amd64-netbsd/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/amd64-netbsd/fontinst
+++ b/Master/bin/amd64-netbsd/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/kpsetool b/Master/bin/amd64-netbsd/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/amd64-netbsd/kpsetool
+++ b/Master/bin/amd64-netbsd/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/kpsewhere b/Master/bin/amd64-netbsd/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/amd64-netbsd/kpsewhere
+++ b/Master/bin/amd64-netbsd/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/ps2frag b/Master/bin/amd64-netbsd/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/amd64-netbsd/ps2frag
+++ b/Master/bin/amd64-netbsd/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/pslatex b/Master/bin/amd64-netbsd/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/amd64-netbsd/pslatex
+++ b/Master/bin/amd64-netbsd/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/rubibtex b/Master/bin/amd64-netbsd/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/amd64-netbsd/rubibtex
+++ b/Master/bin/amd64-netbsd/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/rumakeindex b/Master/bin/amd64-netbsd/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/amd64-netbsd/rumakeindex
+++ b/Master/bin/amd64-netbsd/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/texconfig b/Master/bin/amd64-netbsd/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/amd64-netbsd/texconfig
+++ b/Master/bin/amd64-netbsd/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/texconfig-dialog b/Master/bin/amd64-netbsd/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/amd64-netbsd/texconfig-dialog
+++ b/Master/bin/amd64-netbsd/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/texconfig-sys b/Master/bin/amd64-netbsd/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/amd64-netbsd/texconfig-sys
+++ b/Master/bin/amd64-netbsd/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/texlinks b/Master/bin/amd64-netbsd/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/amd64-netbsd/texlinks
+++ b/Master/bin/amd64-netbsd/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/dvi2fax b/Master/bin/armhf-linux/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/armhf-linux/dvi2fax
+++ b/Master/bin/armhf-linux/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/dvired b/Master/bin/armhf-linux/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/armhf-linux/dvired
+++ b/Master/bin/armhf-linux/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/e2pall b/Master/bin/armhf-linux/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/armhf-linux/e2pall
+++ b/Master/bin/armhf-linux/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/armhf-linux/fontinst b/Master/bin/armhf-linux/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/armhf-linux/fontinst
+++ b/Master/bin/armhf-linux/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/kpsetool b/Master/bin/armhf-linux/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/armhf-linux/kpsetool
+++ b/Master/bin/armhf-linux/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/kpsewhere b/Master/bin/armhf-linux/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/armhf-linux/kpsewhere
+++ b/Master/bin/armhf-linux/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/ps2frag b/Master/bin/armhf-linux/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/armhf-linux/ps2frag
+++ b/Master/bin/armhf-linux/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/pslatex b/Master/bin/armhf-linux/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/armhf-linux/pslatex
+++ b/Master/bin/armhf-linux/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/rubibtex b/Master/bin/armhf-linux/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/armhf-linux/rubibtex
+++ b/Master/bin/armhf-linux/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/rumakeindex b/Master/bin/armhf-linux/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/armhf-linux/rumakeindex
+++ b/Master/bin/armhf-linux/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/texconfig b/Master/bin/armhf-linux/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/armhf-linux/texconfig
+++ b/Master/bin/armhf-linux/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/texconfig-dialog b/Master/bin/armhf-linux/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/armhf-linux/texconfig-dialog
+++ b/Master/bin/armhf-linux/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/texconfig-sys b/Master/bin/armhf-linux/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/armhf-linux/texconfig-sys
+++ b/Master/bin/armhf-linux/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/texlinks b/Master/bin/armhf-linux/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/armhf-linux/texlinks
+++ b/Master/bin/armhf-linux/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/dvi2fax b/Master/bin/i386-cygwin/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/i386-cygwin/dvi2fax
+++ b/Master/bin/i386-cygwin/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/dvired b/Master/bin/i386-cygwin/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/i386-cygwin/dvired
+++ b/Master/bin/i386-cygwin/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/e2pall b/Master/bin/i386-cygwin/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/i386-cygwin/e2pall
+++ b/Master/bin/i386-cygwin/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/fontinst b/Master/bin/i386-cygwin/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/i386-cygwin/fontinst
+++ b/Master/bin/i386-cygwin/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/kpsetool b/Master/bin/i386-cygwin/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/i386-cygwin/kpsetool
+++ b/Master/bin/i386-cygwin/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/kpsewhere b/Master/bin/i386-cygwin/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/i386-cygwin/kpsewhere
+++ b/Master/bin/i386-cygwin/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/ps2frag b/Master/bin/i386-cygwin/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/i386-cygwin/ps2frag
+++ b/Master/bin/i386-cygwin/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/pslatex b/Master/bin/i386-cygwin/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/i386-cygwin/pslatex
+++ b/Master/bin/i386-cygwin/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/rubibtex b/Master/bin/i386-cygwin/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/i386-cygwin/rubibtex
+++ b/Master/bin/i386-cygwin/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/rumakeindex b/Master/bin/i386-cygwin/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/i386-cygwin/rumakeindex
+++ b/Master/bin/i386-cygwin/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/texconfig b/Master/bin/i386-cygwin/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/i386-cygwin/texconfig
+++ b/Master/bin/i386-cygwin/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/texconfig-dialog b/Master/bin/i386-cygwin/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/i386-cygwin/texconfig-dialog
+++ b/Master/bin/i386-cygwin/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/texconfig-sys b/Master/bin/i386-cygwin/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/i386-cygwin/texconfig-sys
+++ b/Master/bin/i386-cygwin/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/texlinks b/Master/bin/i386-cygwin/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/i386-cygwin/texlinks
+++ b/Master/bin/i386-cygwin/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/dvi2fax b/Master/bin/i386-freebsd/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/i386-freebsd/dvi2fax
+++ b/Master/bin/i386-freebsd/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/dvired b/Master/bin/i386-freebsd/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/i386-freebsd/dvired
+++ b/Master/bin/i386-freebsd/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/e2pall b/Master/bin/i386-freebsd/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/i386-freebsd/e2pall
+++ b/Master/bin/i386-freebsd/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/fontinst b/Master/bin/i386-freebsd/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/i386-freebsd/fontinst
+++ b/Master/bin/i386-freebsd/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/kpsetool b/Master/bin/i386-freebsd/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/i386-freebsd/kpsetool
+++ b/Master/bin/i386-freebsd/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/kpsewhere b/Master/bin/i386-freebsd/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/i386-freebsd/kpsewhere
+++ b/Master/bin/i386-freebsd/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/ps2frag b/Master/bin/i386-freebsd/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/i386-freebsd/ps2frag
+++ b/Master/bin/i386-freebsd/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/pslatex b/Master/bin/i386-freebsd/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/i386-freebsd/pslatex
+++ b/Master/bin/i386-freebsd/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/rubibtex b/Master/bin/i386-freebsd/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/i386-freebsd/rubibtex
+++ b/Master/bin/i386-freebsd/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/rumakeindex b/Master/bin/i386-freebsd/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/i386-freebsd/rumakeindex
+++ b/Master/bin/i386-freebsd/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/texconfig b/Master/bin/i386-freebsd/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/i386-freebsd/texconfig
+++ b/Master/bin/i386-freebsd/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/texconfig-dialog b/Master/bin/i386-freebsd/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/i386-freebsd/texconfig-dialog
+++ b/Master/bin/i386-freebsd/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/texconfig-sys b/Master/bin/i386-freebsd/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/i386-freebsd/texconfig-sys
+++ b/Master/bin/i386-freebsd/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/texlinks b/Master/bin/i386-freebsd/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/i386-freebsd/texlinks
+++ b/Master/bin/i386-freebsd/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/dvi2fax b/Master/bin/i386-linux/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/i386-linux/dvi2fax
+++ b/Master/bin/i386-linux/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/dvired b/Master/bin/i386-linux/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/i386-linux/dvired
+++ b/Master/bin/i386-linux/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/e2pall b/Master/bin/i386-linux/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/i386-linux/e2pall
+++ b/Master/bin/i386-linux/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/i386-linux/fontinst b/Master/bin/i386-linux/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/i386-linux/fontinst
+++ b/Master/bin/i386-linux/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/kpsetool b/Master/bin/i386-linux/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/i386-linux/kpsetool
+++ b/Master/bin/i386-linux/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/kpsewhere b/Master/bin/i386-linux/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/i386-linux/kpsewhere
+++ b/Master/bin/i386-linux/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/ps2frag b/Master/bin/i386-linux/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/i386-linux/ps2frag
+++ b/Master/bin/i386-linux/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/pslatex b/Master/bin/i386-linux/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/i386-linux/pslatex
+++ b/Master/bin/i386-linux/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/rubibtex b/Master/bin/i386-linux/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/i386-linux/rubibtex
+++ b/Master/bin/i386-linux/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/rumakeindex b/Master/bin/i386-linux/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/i386-linux/rumakeindex
+++ b/Master/bin/i386-linux/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/i386-linux/texconfig
+++ b/Master/bin/i386-linux/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/texconfig-dialog b/Master/bin/i386-linux/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/i386-linux/texconfig-dialog
+++ b/Master/bin/i386-linux/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/texconfig-sys b/Master/bin/i386-linux/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/i386-linux/texconfig-sys
+++ b/Master/bin/i386-linux/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/texlinks b/Master/bin/i386-linux/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/i386-linux/texlinks
+++ b/Master/bin/i386-linux/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/dvi2fax b/Master/bin/i386-netbsd/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/i386-netbsd/dvi2fax
+++ b/Master/bin/i386-netbsd/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/dvired b/Master/bin/i386-netbsd/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/i386-netbsd/dvired
+++ b/Master/bin/i386-netbsd/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/e2pall b/Master/bin/i386-netbsd/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/i386-netbsd/e2pall
+++ b/Master/bin/i386-netbsd/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/fontinst b/Master/bin/i386-netbsd/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/i386-netbsd/fontinst
+++ b/Master/bin/i386-netbsd/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/kpsetool b/Master/bin/i386-netbsd/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/i386-netbsd/kpsetool
+++ b/Master/bin/i386-netbsd/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/kpsewhere b/Master/bin/i386-netbsd/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/i386-netbsd/kpsewhere
+++ b/Master/bin/i386-netbsd/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/ps2frag b/Master/bin/i386-netbsd/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/i386-netbsd/ps2frag
+++ b/Master/bin/i386-netbsd/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/pslatex b/Master/bin/i386-netbsd/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/i386-netbsd/pslatex
+++ b/Master/bin/i386-netbsd/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/rubibtex b/Master/bin/i386-netbsd/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/i386-netbsd/rubibtex
+++ b/Master/bin/i386-netbsd/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/rumakeindex b/Master/bin/i386-netbsd/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/i386-netbsd/rumakeindex
+++ b/Master/bin/i386-netbsd/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/texconfig b/Master/bin/i386-netbsd/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/i386-netbsd/texconfig
+++ b/Master/bin/i386-netbsd/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/texconfig-dialog b/Master/bin/i386-netbsd/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/i386-netbsd/texconfig-dialog
+++ b/Master/bin/i386-netbsd/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/texconfig-sys b/Master/bin/i386-netbsd/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/i386-netbsd/texconfig-sys
+++ b/Master/bin/i386-netbsd/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/texlinks b/Master/bin/i386-netbsd/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/i386-netbsd/texlinks
+++ b/Master/bin/i386-netbsd/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/dvi2fax b/Master/bin/i386-solaris/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/i386-solaris/dvi2fax
+++ b/Master/bin/i386-solaris/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/dvired b/Master/bin/i386-solaris/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/i386-solaris/dvired
+++ b/Master/bin/i386-solaris/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/e2pall b/Master/bin/i386-solaris/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/i386-solaris/e2pall
+++ b/Master/bin/i386-solaris/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/i386-solaris/fontinst b/Master/bin/i386-solaris/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/i386-solaris/fontinst
+++ b/Master/bin/i386-solaris/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/kpsetool b/Master/bin/i386-solaris/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/i386-solaris/kpsetool
+++ b/Master/bin/i386-solaris/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/kpsewhere b/Master/bin/i386-solaris/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/i386-solaris/kpsewhere
+++ b/Master/bin/i386-solaris/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/ps2frag b/Master/bin/i386-solaris/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/i386-solaris/ps2frag
+++ b/Master/bin/i386-solaris/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/pslatex b/Master/bin/i386-solaris/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/i386-solaris/pslatex
+++ b/Master/bin/i386-solaris/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/rubibtex b/Master/bin/i386-solaris/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/i386-solaris/rubibtex
+++ b/Master/bin/i386-solaris/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/rumakeindex b/Master/bin/i386-solaris/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/i386-solaris/rumakeindex
+++ b/Master/bin/i386-solaris/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/texconfig b/Master/bin/i386-solaris/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/i386-solaris/texconfig
+++ b/Master/bin/i386-solaris/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/texconfig-dialog b/Master/bin/i386-solaris/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/i386-solaris/texconfig-dialog
+++ b/Master/bin/i386-solaris/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/texconfig-sys b/Master/bin/i386-solaris/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/i386-solaris/texconfig-sys
+++ b/Master/bin/i386-solaris/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/texlinks b/Master/bin/i386-solaris/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/i386-solaris/texlinks
+++ b/Master/bin/i386-solaris/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/dvi2fax b/Master/bin/x86_64-cygwin/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/x86_64-cygwin/dvi2fax
+++ b/Master/bin/x86_64-cygwin/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/dvired b/Master/bin/x86_64-cygwin/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/x86_64-cygwin/dvired
+++ b/Master/bin/x86_64-cygwin/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/e2pall b/Master/bin/x86_64-cygwin/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/x86_64-cygwin/e2pall
+++ b/Master/bin/x86_64-cygwin/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/fontinst b/Master/bin/x86_64-cygwin/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/x86_64-cygwin/fontinst
+++ b/Master/bin/x86_64-cygwin/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/kpsetool b/Master/bin/x86_64-cygwin/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/x86_64-cygwin/kpsetool
+++ b/Master/bin/x86_64-cygwin/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/kpsewhere b/Master/bin/x86_64-cygwin/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/x86_64-cygwin/kpsewhere
+++ b/Master/bin/x86_64-cygwin/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/ps2frag b/Master/bin/x86_64-cygwin/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/x86_64-cygwin/ps2frag
+++ b/Master/bin/x86_64-cygwin/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/pslatex b/Master/bin/x86_64-cygwin/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/x86_64-cygwin/pslatex
+++ b/Master/bin/x86_64-cygwin/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/rubibtex b/Master/bin/x86_64-cygwin/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/x86_64-cygwin/rubibtex
+++ b/Master/bin/x86_64-cygwin/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/rumakeindex b/Master/bin/x86_64-cygwin/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/x86_64-cygwin/rumakeindex
+++ b/Master/bin/x86_64-cygwin/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/texconfig b/Master/bin/x86_64-cygwin/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/x86_64-cygwin/texconfig
+++ b/Master/bin/x86_64-cygwin/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/texconfig-dialog b/Master/bin/x86_64-cygwin/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/x86_64-cygwin/texconfig-dialog
+++ b/Master/bin/x86_64-cygwin/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/texconfig-sys b/Master/bin/x86_64-cygwin/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/x86_64-cygwin/texconfig-sys
+++ b/Master/bin/x86_64-cygwin/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/texlinks b/Master/bin/x86_64-cygwin/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/x86_64-cygwin/texlinks
+++ b/Master/bin/x86_64-cygwin/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/dvi2fax b/Master/bin/x86_64-darwin/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/x86_64-darwin/dvi2fax
+++ b/Master/bin/x86_64-darwin/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/dvired b/Master/bin/x86_64-darwin/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/x86_64-darwin/dvired
+++ b/Master/bin/x86_64-darwin/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/e2pall b/Master/bin/x86_64-darwin/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/x86_64-darwin/e2pall
+++ b/Master/bin/x86_64-darwin/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/fontinst b/Master/bin/x86_64-darwin/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/x86_64-darwin/fontinst
+++ b/Master/bin/x86_64-darwin/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/kpsetool b/Master/bin/x86_64-darwin/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/x86_64-darwin/kpsetool
+++ b/Master/bin/x86_64-darwin/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/kpsewhere b/Master/bin/x86_64-darwin/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/x86_64-darwin/kpsewhere
+++ b/Master/bin/x86_64-darwin/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/ps2frag b/Master/bin/x86_64-darwin/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/x86_64-darwin/ps2frag
+++ b/Master/bin/x86_64-darwin/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/pslatex b/Master/bin/x86_64-darwin/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/x86_64-darwin/pslatex
+++ b/Master/bin/x86_64-darwin/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/rubibtex b/Master/bin/x86_64-darwin/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/x86_64-darwin/rubibtex
+++ b/Master/bin/x86_64-darwin/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/rumakeindex b/Master/bin/x86_64-darwin/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/x86_64-darwin/rumakeindex
+++ b/Master/bin/x86_64-darwin/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/texconfig b/Master/bin/x86_64-darwin/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/x86_64-darwin/texconfig
+++ b/Master/bin/x86_64-darwin/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/texconfig-dialog b/Master/bin/x86_64-darwin/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/x86_64-darwin/texconfig-dialog
+++ b/Master/bin/x86_64-darwin/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/texconfig-sys b/Master/bin/x86_64-darwin/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/x86_64-darwin/texconfig-sys
+++ b/Master/bin/x86_64-darwin/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/texlinks b/Master/bin/x86_64-darwin/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/x86_64-darwin/texlinks
+++ b/Master/bin/x86_64-darwin/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/dvi2fax b/Master/bin/x86_64-darwinlegacy/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/x86_64-darwinlegacy/dvi2fax
+++ b/Master/bin/x86_64-darwinlegacy/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/dvired b/Master/bin/x86_64-darwinlegacy/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/x86_64-darwinlegacy/dvired
+++ b/Master/bin/x86_64-darwinlegacy/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/e2pall b/Master/bin/x86_64-darwinlegacy/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/x86_64-darwinlegacy/e2pall
+++ b/Master/bin/x86_64-darwinlegacy/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/fontinst b/Master/bin/x86_64-darwinlegacy/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/x86_64-darwinlegacy/fontinst
+++ b/Master/bin/x86_64-darwinlegacy/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/kpsetool b/Master/bin/x86_64-darwinlegacy/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/x86_64-darwinlegacy/kpsetool
+++ b/Master/bin/x86_64-darwinlegacy/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/kpsewhere b/Master/bin/x86_64-darwinlegacy/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/x86_64-darwinlegacy/kpsewhere
+++ b/Master/bin/x86_64-darwinlegacy/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/ps2frag b/Master/bin/x86_64-darwinlegacy/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/x86_64-darwinlegacy/ps2frag
+++ b/Master/bin/x86_64-darwinlegacy/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/pslatex b/Master/bin/x86_64-darwinlegacy/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/x86_64-darwinlegacy/pslatex
+++ b/Master/bin/x86_64-darwinlegacy/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/rubibtex b/Master/bin/x86_64-darwinlegacy/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/x86_64-darwinlegacy/rubibtex
+++ b/Master/bin/x86_64-darwinlegacy/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/rumakeindex b/Master/bin/x86_64-darwinlegacy/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/x86_64-darwinlegacy/rumakeindex
+++ b/Master/bin/x86_64-darwinlegacy/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/texconfig b/Master/bin/x86_64-darwinlegacy/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/x86_64-darwinlegacy/texconfig
+++ b/Master/bin/x86_64-darwinlegacy/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/texconfig-dialog b/Master/bin/x86_64-darwinlegacy/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/x86_64-darwinlegacy/texconfig-dialog
+++ b/Master/bin/x86_64-darwinlegacy/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/texconfig-sys b/Master/bin/x86_64-darwinlegacy/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/x86_64-darwinlegacy/texconfig-sys
+++ b/Master/bin/x86_64-darwinlegacy/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/texlinks b/Master/bin/x86_64-darwinlegacy/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/x86_64-darwinlegacy/texlinks
+++ b/Master/bin/x86_64-darwinlegacy/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/dvi2fax b/Master/bin/x86_64-linux/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/x86_64-linux/dvi2fax
+++ b/Master/bin/x86_64-linux/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/dvired b/Master/bin/x86_64-linux/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/x86_64-linux/dvired
+++ b/Master/bin/x86_64-linux/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/e2pall b/Master/bin/x86_64-linux/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/x86_64-linux/e2pall
+++ b/Master/bin/x86_64-linux/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/fontinst b/Master/bin/x86_64-linux/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/x86_64-linux/fontinst
+++ b/Master/bin/x86_64-linux/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/kpsetool b/Master/bin/x86_64-linux/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/x86_64-linux/kpsetool
+++ b/Master/bin/x86_64-linux/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/kpsewhere b/Master/bin/x86_64-linux/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/x86_64-linux/kpsewhere
+++ b/Master/bin/x86_64-linux/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/ps2frag b/Master/bin/x86_64-linux/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/x86_64-linux/ps2frag
+++ b/Master/bin/x86_64-linux/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/pslatex b/Master/bin/x86_64-linux/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/x86_64-linux/pslatex
+++ b/Master/bin/x86_64-linux/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/rubibtex b/Master/bin/x86_64-linux/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/x86_64-linux/rubibtex
+++ b/Master/bin/x86_64-linux/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/rumakeindex b/Master/bin/x86_64-linux/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/x86_64-linux/rumakeindex
+++ b/Master/bin/x86_64-linux/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/texconfig b/Master/bin/x86_64-linux/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/x86_64-linux/texconfig
+++ b/Master/bin/x86_64-linux/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/texconfig-dialog b/Master/bin/x86_64-linux/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/x86_64-linux/texconfig-dialog
+++ b/Master/bin/x86_64-linux/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/texconfig-sys b/Master/bin/x86_64-linux/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/x86_64-linux/texconfig-sys
+++ b/Master/bin/x86_64-linux/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/texlinks b/Master/bin/x86_64-linux/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/x86_64-linux/texlinks
+++ b/Master/bin/x86_64-linux/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/dvi2fax b/Master/bin/x86_64-linuxmusl/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/x86_64-linuxmusl/dvi2fax
+++ b/Master/bin/x86_64-linuxmusl/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/dvired b/Master/bin/x86_64-linuxmusl/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/x86_64-linuxmusl/dvired
+++ b/Master/bin/x86_64-linuxmusl/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/e2pall b/Master/bin/x86_64-linuxmusl/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/x86_64-linuxmusl/e2pall
+++ b/Master/bin/x86_64-linuxmusl/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/fontinst b/Master/bin/x86_64-linuxmusl/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/x86_64-linuxmusl/fontinst
+++ b/Master/bin/x86_64-linuxmusl/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/kpsetool b/Master/bin/x86_64-linuxmusl/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/x86_64-linuxmusl/kpsetool
+++ b/Master/bin/x86_64-linuxmusl/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/kpsewhere b/Master/bin/x86_64-linuxmusl/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/x86_64-linuxmusl/kpsewhere
+++ b/Master/bin/x86_64-linuxmusl/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/ps2frag b/Master/bin/x86_64-linuxmusl/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/x86_64-linuxmusl/ps2frag
+++ b/Master/bin/x86_64-linuxmusl/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/pslatex b/Master/bin/x86_64-linuxmusl/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/x86_64-linuxmusl/pslatex
+++ b/Master/bin/x86_64-linuxmusl/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/rubibtex b/Master/bin/x86_64-linuxmusl/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/x86_64-linuxmusl/rubibtex
+++ b/Master/bin/x86_64-linuxmusl/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/rumakeindex b/Master/bin/x86_64-linuxmusl/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/x86_64-linuxmusl/rumakeindex
+++ b/Master/bin/x86_64-linuxmusl/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/texconfig b/Master/bin/x86_64-linuxmusl/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/x86_64-linuxmusl/texconfig
+++ b/Master/bin/x86_64-linuxmusl/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/texconfig-dialog b/Master/bin/x86_64-linuxmusl/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/x86_64-linuxmusl/texconfig-dialog
+++ b/Master/bin/x86_64-linuxmusl/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/texconfig-sys b/Master/bin/x86_64-linuxmusl/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/x86_64-linuxmusl/texconfig-sys
+++ b/Master/bin/x86_64-linuxmusl/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/texlinks b/Master/bin/x86_64-linuxmusl/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/x86_64-linuxmusl/texlinks
+++ b/Master/bin/x86_64-linuxmusl/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/dvi2fax b/Master/bin/x86_64-solaris/dvi2fax
index 0c426d0747b..93d5a4afb57 120000
--- a/Master/bin/x86_64-solaris/dvi2fax
+++ b/Master/bin/x86_64-solaris/dvi2fax
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvi2fax.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvi2fax.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/dvired b/Master/bin/x86_64-solaris/dvired
index 8f3dd685952..d350cbd0b13 120000
--- a/Master/bin/x86_64-solaris/dvired
+++ b/Master/bin/x86_64-solaris/dvired
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/dvired.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/dvired.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/e2pall b/Master/bin/x86_64-solaris/e2pall
index ac25e92eff9..064b677bdee 120000
--- a/Master/bin/x86_64-solaris/e2pall
+++ b/Master/bin/x86_64-solaris/e2pall
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/e2pall.pl \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/e2pall.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/fontinst b/Master/bin/x86_64-solaris/fontinst
index a13919e99df..0e3ee32572a 120000
--- a/Master/bin/x86_64-solaris/fontinst
+++ b/Master/bin/x86_64-solaris/fontinst
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/fontinst.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/fontinst.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/kpsetool b/Master/bin/x86_64-solaris/kpsetool
index dd4770a5a32..7a8d6d69278 120000
--- a/Master/bin/x86_64-solaris/kpsetool
+++ b/Master/bin/x86_64-solaris/kpsetool
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsetool.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsetool.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/kpsewhere b/Master/bin/x86_64-solaris/kpsewhere
index a23cd2f30f0..c7e8758cbf1 120000
--- a/Master/bin/x86_64-solaris/kpsewhere
+++ b/Master/bin/x86_64-solaris/kpsewhere
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/kpsewhere.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/kpsewhere.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/ps2frag b/Master/bin/x86_64-solaris/ps2frag
index af592408647..5704e679f86 120000
--- a/Master/bin/x86_64-solaris/ps2frag
+++ b/Master/bin/x86_64-solaris/ps2frag
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/ps2frag.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/ps2frag.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/pslatex b/Master/bin/x86_64-solaris/pslatex
index bf1200c441f..d07ce6efab4 120000
--- a/Master/bin/x86_64-solaris/pslatex
+++ b/Master/bin/x86_64-solaris/pslatex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/pslatex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/pslatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/rubibtex b/Master/bin/x86_64-solaris/rubibtex
index bf54113880b..6503609c337 120000
--- a/Master/bin/x86_64-solaris/rubibtex
+++ b/Master/bin/x86_64-solaris/rubibtex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rubibtex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rubibtex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/rumakeindex b/Master/bin/x86_64-solaris/rumakeindex
index 148f02ba687..4f6093a7446 120000
--- a/Master/bin/x86_64-solaris/rumakeindex
+++ b/Master/bin/x86_64-solaris/rumakeindex
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/rumakeindex.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/rumakeindex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/texconfig b/Master/bin/x86_64-solaris/texconfig
index d6416e0f64a..307739ca084 120000
--- a/Master/bin/x86_64-solaris/texconfig
+++ b/Master/bin/x86_64-solaris/texconfig
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/texconfig-dialog b/Master/bin/x86_64-solaris/texconfig-dialog
index cc313070771..a4cee31111d 120000
--- a/Master/bin/x86_64-solaris/texconfig-dialog
+++ b/Master/bin/x86_64-solaris/texconfig-dialog
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-dialog.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/texconfig-sys b/Master/bin/x86_64-solaris/texconfig-sys
index 817f71c4aed..e731b74e431 120000
--- a/Master/bin/x86_64-solaris/texconfig-sys
+++ b/Master/bin/x86_64-solaris/texconfig-sys
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texconfig-sys.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texconfig-sys.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/texlinks b/Master/bin/x86_64-solaris/texlinks
index f3d3fa5e841..61bc8aa21da 120000
--- a/Master/bin/x86_64-solaris/texlinks
+++ b/Master/bin/x86_64-solaris/texlinks
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/texlinks.sh \ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/texlinks.sh \ No newline at end of file
diff --git a/Master/texmf-dist/doc/tetex/TETEXDOC.pdf b/Master/texmf-dist/doc/tetex/TETEXDOC.pdf
deleted file mode 100644
index 69649b88a8c..00000000000
--- a/Master/texmf-dist/doc/tetex/TETEXDOC.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/tetex/teTeX-FAQ b/Master/texmf-dist/doc/tetex/teTeX-FAQ
deleted file mode 100644
index 025a668de92..00000000000
--- a/Master/texmf-dist/doc/tetex/teTeX-FAQ
+++ /dev/null
@@ -1,440 +0,0 @@
-This is the FAQ for teTeX -- a TeX distribution for UNIX compatible
-systems. If you have questions about some points that remain unclear,
-or if you think that things could be described better, just drop me
-a line. My Email address:
-
- Thomas Esser <te@dbs.uni-hannover.de>
-
-
-This article includes answers to:
- 0) Where can I get the teTeX distribution?
- 1) Is there a mailing list for teTeX?
- 2) Now that I know that there is a mailing list: is there an archive
- 6) I added some files in the texmf tree. But they are not found.
- 7) When running some old dvi files through a dvi driver, I get warnings
- 8) What is the best method to get pk fonts in a batch job?
- 9) What to do if I need the fonts for several modes?
- 10) Can I share the teTeX directory tree between different platforms?
- 11) After mktexpk and mktextfm successfully generate fonts, kpathsea
- 12) mktextfm runs Metafont with a mode that I do not like.
- 14) How about adding program XYY or a macro package ABC to teTeX?
- 15) I want to keep my files separate from the system's files. What do
- I need to do to make sure that tex+friends will find my files?
- 16) How do I deinstall an old version of teTeX?
- 17) How do I manage to execute the right binaries on each platform?
- 20) Using the Shrink* Buttons in xdvi, I cannot get back to see the full
- 21) Which is the right way of using the AMS fonts/macros with LaTeX?
- 23) Some things do not work properly. What should I do now?
- 24) I get a error message about "TeX capacity exceeded". What can I do?
- 25) The scrollbars of xdvi do not make sense to me. How do I move backwards?
- 26) Is teTeX freely redistributable?
- 27) dvips, pdftex, dvipdfm and xdvi use the European A4 size as default
- 28) Why does ghostview display of my texts look so much worse than
- 29) Metafont does not support the X display.
- 32) How can I get the Euro currency symbol?
- 33) Font map files and enc files from my local texmf tree are not
- found by dvips / pdftex etc.
- 34) texconfig, updmap and fmtutil just change my personal settings. How
- can I change global defaults in a multi-user setup?
-
-Answers:
-
-0) Where can I get the teTeX distribution?
-
- teTeX can be downloaded from CTAN and CTAN mirrors, e.g.:
- ftp://ftp.dante.de/tex-archive/systems/unix/teTeX/
- ftp://ftp.tex.ac.uk/tex-archive/systems/unix/teTeX/
- ftp://ftp.duke.edu/tex-archive/systems/unix/teTeX/
- ftp://sunsite.auc.dk/pub/tex/ctan/systems/unix/teTeX/
-
-1) Is there a mailing list for teTeX?
-
- Yes. There is one list for discussion and one (moderated) list for
- announcements. The discussion list is
- tetex@dbs.uni-hannover.de
- and the announcement list is
- tetex-announce@dbs.uni-hannover.de
- To subscribe to one of these lists, send a message containing the line
- subscribe tetex
- or
- subscribe tetex-announce
- resp. to majordomo@dbs.uni-hannover.de . The majordomo server
- understands a few more commands. To get more help about our
- server, send a mail with the line 'help' in the body.
- Note that announcements are posted into both lists, so if you are
- interested in discussions and announcements, you only need to
- subscribe to the tetex list.
-
-2) Now that I know that there is a mailing list: is there an archive
- of the list?
-
- Yes. Just send a message with the line
- get tetex archive
- to majordomo@dbs.uni-hannover.de .
-
-6) I added some files in the texmf tree. But they are not found.
-
- You need to run texhash to update the ls-R file. See answer to 15)
- as well...
-
-7) When running some old dvi files through a dvi driver, I get warnings
- about checksum errors.
-
- The Postscript fonts are completely rearranged and the tfm files have
- different checksums. If you have the (La)TeX source of your document,
- you can get rid of the messages by running the sources through (La)TeX
- again.
-
-8) What is the best method to get pk fonts in a batch job?
-
- If you do have lots of dvi files (e.g. the documentation of teTeX),
- just run the allneeded script on them. It runs all those files
- through dvips (but output is send to /dev/null and not to a printer),
- and thus calculates all fonts that are needed to print these files
- (or preview with the same mode).
-
- Example:
- allneeded `kpsexpand '$TEXMFMAIN'`/doc >& /tmp/allneeded.log &
-
- The above command calculates the pk files for all the installed
- documentation in a background job.
-
- If you do not have many dvi files, you can use the allcm and/or
- allec scripts (allcm is for Computer Modern fonts, and allec for the
- ec fonts). You need to have LaTeX installed and the scripts calculate
- the fonts for all sizes and shapes that are used in typical LaTeX
- documents.
-
-9) What to do if I need the fonts for several modes?
-
- You only need the modes together with a printer or for previewing. You
- should add a dvips configuration file for each printer using texconfig
- and use the most common printing mode for previewing.
- Then, any of the above scripts in 8) (allneeded, allcm, allec) can be
- given an argument of the form -P PRINTER (where PRINTER must be a known
- printer for dvips). This will calculate the fonts with the mode of
- the printer PRINTER.
-
- Example:
- For dvips I have configured the printer lp to have the mode
- ljfour. To get all ec fonts with ljfour mode, I would enter:
-
- allec -P lp
-
- If you do not have a dvips configuration file that corresponds to a
- specific mode, you can still enter the mode on the command line.
- Note however, that you should specify the corresponding resolution
- as well.
-
- Example:
- To get all fonts in cx mode (CanonCX mode is used by many 300dpi
- printers), give the command:
-
- allcm -D 300 -mode cx
-
- The flags -D and -mode are directly passed down to dvips.
-
-10) Can I share the teTeX directory tree between different platforms?
-
- Yes. The only platform-specific directory is $TETEXDIR/bin. If you
- want to use the same teTeX tree on different platforms, just put
- the binaries for each platform into a different subdirectory of
- $prefix/bin, e.g
- /usr/local/teTeX/bin/i486-linux
- /usr/local/teTeX/bin/sparc-solaris2.4
- You can then mount the whole /usr/local/teTeX tree on all machines
- and share almost all the files between them.
-
-11) After mktexpk and mktextfm successfully generate fonts, kpathsea
- complains and does not use the newly generated font.
-
- If you happen to see output like this:
- ...
- Transcript written on ecti1000.log.
- /usr/local/teTeX/texmf/fonts/tfm/jknappen/ec/ecti1000.tfm
- kpathsea: Appending font creation commands to missfont.log.
- ...
- then your shell is probably very broken. This problem is known with
- the original bash 1.14.3 that has many problems with exit codes and
- trap handling. Try the following line:
-
- sh -c 'exit 1'; echo $?
-
- The buggy bash gives 127 as result. Fixes for these problems have been
- available e.g. from the internet newsgroup gnu.bash.bug, so not all
- instances of bash 1.14.3 are broken. Later versions of bash should not
- have that bug.
-
-12) mktextfm runs Metafont with a mode that I do not like.
-
- Use texconfig and select a different mode as default mode.
-
-14) How about adding program XYY or a macro package ABC to teTeX?
-
- Well, there are some things to take into account:
- - I want to keep the size of the distribution small.
- - I have only a limited amount of time.
- - teTeX can be installed with a simple
- ./configure && make && make install
- on the most common UNIX platforms. Adding a new program could
- break the whole thing.
- Please, think about this before asking me to add something. But if a
- really useful thing can be added without much effort and disk space
- usage, I may decide to do that.
-
- Another possibility is, that things are added to the contrib directory
- of teTeX.
-
-15) I want to keep my files separate from the system's files. What do
- I need to do to make sure that tex+friends will find my files?
-
- If you are a local site administrator, please make use of the texmf
- tree $TEXMFLOCAL; a single user installation of local additions
- should go into the texmf tree $HOME/texmf. Mirror the structure
- of the distributed texmf tree $TEXMFDIST. You can query the system
- about these locations (TEXMFLOCAL / TEXMFDIST) by running e.g.
- kpsewhich -var-value TEXMFLOCAL
-
- The structure of these trees follows the TeX Directory Structure
- (TDS) standard (revision 1.1). You can view this document by running
- the command
- texdoc tds
-
- The following sections of the uktug faq deal with this topic:
- $TEXMFDIST/doc/help/faq/uktug-faq/FAQ-instpackages.html
- $TEXMFDIST/doc/help/faq/uktug-faq/FAQ-wherefiles.html
- $TEXMFDIST/doc/help/faq/uktug-faq/FAQ-privinst.html
-
- If texdoc properly knows how to load some html code into your browser,
- you can view these pages by running e.g.
- texdoc FAQ-instpackages.html
-
- One thing mentioned in the uktug faq is so important that I want to
- repeat here: you should always run the command
- texhash
- after you have added some file into a texmf tree.
-
-16) How do I deinstall an old version of teTeX?
-
- Well, the simple answer is: rm -rf. But there may be some more things
- you want to do. You may keep a backup of your .pk fonts or of some
- local files you added to $TEXMF before you remove the old directory
- tree. Note, however that from teTeX 0.2 to 0.3, there has been an
- update of the CM fonts (Knuth has updated the Metafont sources). So
- you may want to remove your old .pk files and have them recreated
- with the new sources.
-
- Another problem is, that there may be some symbolic links in
- /usr/local/{bin,man} (or a similar directory) after you remove the
- old teTeX directory tree and you may want to remove those links,
- too. A simple way to do this, is the following:
-
- cd /usr/local/bin
- sh -c 'for i in *; do test -s $i || echo $i; done'
-
- This loop echo'es all files with zero length, especially all stale
- symbolic links. If you want to remove all files that are shown by the
- command above, you can do this with:
-
- sh -c 'for i in *; do test -s $i || rm -f $i; done'
-
- You can repeat the above steps for other directories, as well
- (e.g. /usr/local/man/man1 and /usr/local/man/man5).
-
-17) How do I manage to execute the right binaries on each platform?
-
- Assuming that you have binaries for several platforms installed, your
- binaries are in $TETEXDIR/bin/PLATFORM. The first thing you can try is
- to set up your PATH with
- SYSDIR=`uname -m`-`uname -s`
- PATH=$TETEXDIR/bin/$SYSDIR:...
- You may need to rename the PLATFORM directories for this method.
-
- Another thing that may help is to include a local directory in your
- PATH (e.g. /usr/local/bin) and create symbolic links for the binaries:
- linux# ln -sf /usr/local/teTeX/bin/i486-linux/* /usr/local/bin
- sun# ln -sf /usr/local/teTeX/bin/sparc-solaris2.4/* /usr/local/bin
- ...
-
- If you do not like the uname-method for your PATH and the symlink
- method, you may consider installing a small wrapper program that
- calls the programs for the right platform. Install the wrapper in
- $TETEXDIR/bin and create a symbolic link for each binary.
-
- Here an example:
- TETEXDIR=/usr/local/teTeX
- cd $TETEXDIR/bin
- vi platf_wrapper # see script below ...
- chmod +x platf_wrapper
- list=`ls i486-linux` # get a list of programs.
- for i in $list; do
- ln -s platf_wrapper $i
- done
-
- Tell your users to include $TETEXDIR/bin in their PATH. Make sure
- that TETEXDIR is either set to an absolute path (e.g. /usr/local/teTeX)
- or to $SELFAUTODIR (but not $SELFAUTOPARENT), since the programs are
- now found one directory level earlier.
-
- Now the sample wrapper. Customize, if you need:
-
- #!/bin/sh
-
- # the path to the directories with the subdirs for each platform
- BINDIR=/usr/local/teTeX/bin
-
- # export the variable. If we are called again,
- # we do not need to recalculate.
- export THIS_PLATFORM
-
- case "$THIS_PLATFORM" in
- "")
- case "`uname -s`" in
- Linux)
- THIS_PLATFORM=i486-linux;;
- SunOS)
- THIS_PLATFORM=sparc-solaris2.4;;
- IRIX)
- THIS_PLATFORM=mips-irix5.3;;
- *)
- echo "$0: fatal error: system not detected." >&2
- exit 1
- esac;;
- esac
-
- exec $BINDIR/$THIS_PLATFORM/`basename $0` "$@"
-
-20) Using the Shrink* Buttons in xdvi, I cannot get back to see the full
- page on the screen.
-
- The four buttons can be configured via X resources. Just add
- them either to your personal X resources (usually ~/.Xdefaults)
- or to xdvi's global configuration file XDvi which resides in
- $TEXMFMAIN/xdvi. Such a resource setting might look like this:
- XDvi*shrinkButton3: 6
- (This example configures button 3 to do a shrinking by a factor of 6).
-
-
-21) Which is the right way of using the AMS fonts/macros with LaTeX?
-
- Just \usepackage{amsmath} and/or \usepackage{amsfonts}. Read
- the documentation in doc/latex/amsmath, doc/latex/amsfonts and
- doc/latex/amscls included in the distributed texmf tree.
-
- Do *not* \usepackage{amstex} (amstex.sty is just for compatibility
- with old documents and only for use in LaTeX's 2.09 compatibility mode).
-
- Add \usepackage{amssymb} to get full access to all AMS symbols.
-
-23) Some things do not work properly. What should I do now?
-
- First, make sure that your "environment" is ok and run
- texconfig confall
- This gives you an idea about which binaries are found along your
- PATH and if you have set some environment variables that might
- confuse teTeX's programs. If in doubt, unset all variables that
- are set in the "environment variables" section of the output.
-
- If binaries other than teTeX's are found, then change the definition
- of your PATH. Put the directory containing teTeX's binaries earlier
- into your PATH, so that teTeX's binaries are found before any other
- TeX related stuff.
-
- Then, your ls-R file might be out of date. Run
- texhash
- and see if your problem goes away.
-
- If your problem is due to old LaTeX209 files that do not work with
- LaTeX2e, then read $TEXMF/doc/latex/base/clsguide.dvi.
-
- If you cannot solve your problem by yourself, then
- a) if you think your problem is a general question about TeX/LaTeX:
- ask in some Newsgroup, such as comp.text.tex for help, or try to
- contact a local TeX user group.
- b) if you think there is a bug in a package contained in teTeX:
- contact the maintainer of the package with a good bug report. Add my
- Email address in the Cc field of your bug report, if you want.
- c) if your problem seems to be teTeX specific (e.g. a problem with
- one of the binaries or shell-scripts), then report it to the
- teTeX mailing list (tetex@dbs.uni-hannover.de). Please
- provide the following information:
-
- * The version of teTeX you have. For example
- teTeX version is 3.0
- (the version information is displayed by running "texconfig conf").
-
- * The flavor of Unix you are running (Solaris, HP, Linux, etc), and
- its version. For example
- The system is Solaris 2.4
-
- * The output of the command
- texconfig conf
-
- * Possibly a *short* TeX file you have problem running, and
- the whole output of `texcommand filename', say, until the
- first error.
-
-24) I get a error message about "TeX capacity exceeded". What can I do?
-
- If there is a constant in the system's texmf.cnf file, just enlarge
- this (by editing the texmf.cnf file) and run the command
- texconfig init
-
-25) The scrollbars of xdvi do not make sense to me. How do I move backwards?
-
- The scrollbars are what one calls Athena scrollbars. To scroll
- forward, click the left mouse button on the location you would want
- to scroll to the beginning of the displayed area. To scroll backward,
- click the right mouse button on where you want to scroll the beginning
- of the displayed area to. Click the middle mouse button for "dragging"
- the beginning of the displayed area around.
-
-26) Is teTeX freely redistributable?
-
- Yes. All parts of teTeX have been classified as being free software.
-
-27) dvips, pdftex, dvipdfm and xdvi use the European A4 size as default
- papersize. How do I change this to make letterpaper the default?
-
- Simple answer: use texconfig.
- texconfig paper letter
-
-28) Why does ghostview display of my texts look so much worse than
- with xdvi?
-
- xdvi does antialiasing. If your version of ghostscript is
- sufficiently new, it has the x11alpha device. Check for this with
- gs -h
- If it has, then putting
- Ghostview*arguments: -sDEVICE=x11alpha
- in your .Xdefault file (typically) will make ghostview use an
- anti-aliasing display as well, at the cost of display speed.
-
-29) Metafont does not support the X display.
- It may be that your Metafont binary is compiled without support for
- the X windows system. If there exists a mfw binary, that one
- has the missing X support you need.
-
-32) How can I get the Euro currency symbol?
-
- In LaTeX, use the marvosym package (documentation: texdoc marvodoc).
- It provides several Euro symbol by the command \EUR. The variants
- \EURtm, \EURhv and \EURcr match are designed to be used together
- with the fonts Times, Helvetica and Courier respectively.
-
-33) Font map files and enc files from my local texmf tree are not found
- by dvips / pdftex etc.
-
- With version 1.1 of the TeX Directory Structure, the location for
- these files was changed. These files are font files and are now
- stored in fonts/{map,enc}/<syntax>/<package>. So, the solution to
- your problem is to rearrange these files in your tree and then call
- the command texhash. More help is given in the release notes section
- of the teTeX manual (run the command "texdoc TETEXDOC" to read it)
- and on the web page http://www.tug.org/texlive/mapenc.html.
-
-34) texconfig, updmap and fmtutil just change my personal settings. How
- can I change global defaults in a multi-user setup?
-
- Simple answer: use the -sys variant of the tool: texconfig-sys,
- updmap-sys and fmtutil-sys.
diff --git a/Master/texmf-dist/scripts/texlive/dvi2fax.sh b/Master/texmf-dist/scripts/texlive-extra/dvi2fax.sh
index fdfa83211eb..fdfa83211eb 100755
--- a/Master/texmf-dist/scripts/texlive/dvi2fax.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/dvi2fax.sh
diff --git a/Master/texmf-dist/scripts/texlive/dvired.sh b/Master/texmf-dist/scripts/texlive-extra/dvired.sh
index 4eb3586119d..4eb3586119d 100755
--- a/Master/texmf-dist/scripts/texlive/dvired.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/dvired.sh
diff --git a/Master/texmf-dist/scripts/texlive/e2pall.pl b/Master/texmf-dist/scripts/texlive-extra/e2pall.pl
index 2997f8b1102..2997f8b1102 100755
--- a/Master/texmf-dist/scripts/texlive/e2pall.pl
+++ b/Master/texmf-dist/scripts/texlive-extra/e2pall.pl
diff --git a/Master/texmf-dist/scripts/texlive/fontinst.sh b/Master/texmf-dist/scripts/texlive-extra/fontinst.sh
index 7d1271517ad..7d1271517ad 100755
--- a/Master/texmf-dist/scripts/texlive/fontinst.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/fontinst.sh
diff --git a/Master/texmf-dist/scripts/texlive/kpsetool.sh b/Master/texmf-dist/scripts/texlive-extra/kpsetool.sh
index 463097fd4a9..463097fd4a9 100755
--- a/Master/texmf-dist/scripts/texlive/kpsetool.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/kpsetool.sh
diff --git a/Master/texmf-dist/scripts/texlive/kpsewhere.sh b/Master/texmf-dist/scripts/texlive-extra/kpsewhere.sh
index 51088ee80d6..51088ee80d6 100755
--- a/Master/texmf-dist/scripts/texlive/kpsewhere.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/kpsewhere.sh
diff --git a/Master/texmf-dist/scripts/texlive/ps2frag.sh b/Master/texmf-dist/scripts/texlive-extra/ps2frag.sh
index b8e673be087..b8e673be087 100755
--- a/Master/texmf-dist/scripts/texlive/ps2frag.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/ps2frag.sh
diff --git a/Master/texmf-dist/scripts/texlive/pslatex.sh b/Master/texmf-dist/scripts/texlive-extra/pslatex.sh
index 4badef0ec12..4badef0ec12 100755
--- a/Master/texmf-dist/scripts/texlive/pslatex.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/pslatex.sh
diff --git a/Master/texmf-dist/scripts/texlive/rubibtex.sh b/Master/texmf-dist/scripts/texlive-extra/rubibtex.sh
index 373e6e1194d..373e6e1194d 100755
--- a/Master/texmf-dist/scripts/texlive/rubibtex.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/rubibtex.sh
diff --git a/Master/texmf-dist/scripts/texlive/rumakeindex.sh b/Master/texmf-dist/scripts/texlive-extra/rumakeindex.sh
index b7b0c072729..b7b0c072729 100755
--- a/Master/texmf-dist/scripts/texlive/rumakeindex.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/rumakeindex.sh
diff --git a/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh b/Master/texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
index 9cfe74c54c0..9cfe74c54c0 100755
--- a/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
diff --git a/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh b/Master/texmf-dist/scripts/texlive-extra/texconfig-sys.sh
index 06513209ff8..06513209ff8 100755
--- a/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/texconfig-sys.sh
diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.sh b/Master/texmf-dist/scripts/texlive-extra/texconfig.sh
index 94ec3fffced..94ec3fffced 100755
--- a/Build/source/texk/texlive/tl_scripts/texconfig.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/texconfig.sh
diff --git a/Build/source/texk/texlive/tl_scripts/texlinks.sh b/Master/texmf-dist/scripts/texlive-extra/texlinks.sh
index 71877768720..71877768720 100755
--- a/Build/source/texk/texlive/tl_scripts/texlinks.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/texlinks.sh
diff --git a/Master/tlpkg/bin/tl-check-wrapper-consistency b/Master/tlpkg/bin/tl-check-wrapper-consistency
index 9ebdcbcc1ae..59e6cb0b3f4 100755
--- a/Master/tlpkg/bin/tl-check-wrapper-consistency
+++ b/Master/tlpkg/bin/tl-check-wrapper-consistency
@@ -122,15 +122,12 @@ sub list_shell_scripts {
# has to be the Work/ directory to get the Makefile, not Makefile.{in,am}.
my $Work = "$Master/../Build/source/Work";
my $Work_linked_scripts = "$Work/texk/texlive/linked_scripts";
- my $Work_tl_scripts = "$Work/texk/texlive/tl_scripts";
-d "$Work_linked_scripts"||die "no linked_scripts dir: $Work_linked_scripts";
- -d "$Work_tl_scripts" || die "no tl_scripts dir: $Work_tl_scripts";
# use make; ensure we get only the last line, although that should be
# all there is.
my $lst = `make -s -C $Work_linked_scripts echo-shell-scripts | tail -1`;
- $lst .= `make -s -C $Work_tl_scripts echo-shell-scripts | tail -1`;
for my $script (split (" ", $lst)) {
$script =~ s,^.*/,,;
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index 589173ac5c6..d53cf762ec3 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -36,7 +36,6 @@ depend mflogo
depend mfware
depend pdftex
depend plain
-depend tetex
depend tex
depend tex-ini-files
depend texlive-common
diff --git a/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc b/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
index 65af78fc8c4..03199ff4f9c 100644
--- a/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
@@ -7,4 +7,3 @@ longdesc separately afterwards, with tlmgr install.
depend texlive.infra
depend kpathsea
depend hyphen-base
-depend tetex
diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc
deleted file mode 100644
index beb946933db..00000000000
--- a/Master/tlpkg/tlpsrc/tetex.tlpsrc
+++ /dev/null
@@ -1,71 +0,0 @@
-category TLCore
-shortdesc scripts and files originally from teTeX
-longdesc Includes both core utilities such as fmtutil and updmap, and
-longdesc rarely-used programs such as allec and dvi2fax. Some
-longdesc functionality is now better provided by tlmgr, such as
-longdesc texconfig and texlinks, but everything here is still supported.
-
-# This is in tetex because this two-entry map file was written by te and
-# is maintained in the tetex directory.
-execute addMap mathpple.map
-
-runpattern f texmf-dist/dvips/tetex/*
-runpattern f texmf-dist/fonts/enc/dvips/tetex/*
-runpattern f texmf-dist/fonts/map/dvips/tetex/*
-runpattern f texmf-dist/web2c/updmap.cfg
-runpattern f texmf-dist/web2c/updmap.cfg
-#
-runpattern f texmf-dist/texconfig/*
-runpattern f texmf-dist/texconfig/g/*
-runpattern f texmf-dist/texconfig/v/*
-runpattern f texmf-dist/texconfig/x/*
-#
-runpattern f texmf-dist/scripts/texlive/dvi2fax.sh
-runpattern f texmf-dist/scripts/texlive/dvired.sh
-runpattern f texmf-dist/scripts/texlive/e2pall.pl
-runpattern f texmf-dist/scripts/texlive/fmtutil-sys.sh
-runpattern f texmf-dist/scripts/texlive/fmtutil-user.sh
-runpattern f texmf-dist/scripts/texlive/fmtutil.pl
-runpattern f texmf-dist/scripts/texlive/kpsetool.sh
-runpattern f texmf-dist/scripts/texlive/kpsewhere.sh
-runpattern f texmf-dist/scripts/texlive/mktexlsr.pl
-runpattern f texmf-dist/scripts/texlive/texconfig.sh
-runpattern f texmf-dist/scripts/texlive/texconfig-dialog.sh
-runpattern f texmf-dist/scripts/texlive/texconfig-sys.sh
-runpattern f texmf-dist/scripts/texlive/texlinks.sh
-runpattern f texmf-dist/scripts/texlive/updmap-sys.sh
-runpattern f texmf-dist/scripts/texlive/updmap-user.sh
-runpattern f texmf-dist/scripts/texlive/updmap.pl
-
-docpattern f texmf-dist/doc/man/man1/dvi2fax.*
-docpattern f texmf-dist/doc/man/man1/dvired.*
-docpattern f texmf-dist/doc/man/man1/e2pall.*
-docpattern f texmf-dist/doc/man/man1/fmtutil*
-docpattern f texmf-dist/doc/man/man1/kpsepath.*
-docpattern f texmf-dist/doc/man/man1/kpsetool.*
-docpattern f texmf-dist/doc/man/man1/kpsewhere.*
-docpattern f texmf-dist/doc/man/man1/kpsexpand.*
-docpattern f texmf-dist/doc/man/man1/texconfig*
-docpattern f texmf-dist/doc/man/man1/texlinks.*
-docpattern f texmf-dist/doc/man/man1/updmap*
-docpattern f texmf-dist/doc/man/man5/fmtutil.cnf.*
-docpattern f texmf-dist/doc/man/man5/updmap.*
-docpattern d texmf-dist/doc/tetex
-
-binpattern f bin/${ARCH}/dvi2fax
-binpattern f bin/${ARCH}/dvired
-binpattern f bin/${ARCH}/e2pall
-binpattern f bin/${ARCH}/fmtutil
-binpattern f bin/${ARCH}/fmtutil-sys
-binpattern f bin/${ARCH}/fmtutil-user
-binpattern f bin/${ARCH}/kpsepath
-binpattern f bin/${ARCH}/kpsetool
-binpattern f bin/${ARCH}/kpsewhere
-binpattern f bin/${ARCH}/kpsexpand
-binpattern f bin/${ARCH}/texconfig
-binpattern f bin/${ARCH}/texconfig-dialog
-binpattern f bin/${ARCH}/texconfig-sys
-binpattern f bin/${ARCH}/texlinks
-binpattern f bin/${ARCH}/updmap
-binpattern f bin/${ARCH}/updmap-sys
-binpattern f bin/${ARCH}/updmap-user
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
index 02b32903b53..52167790bf6 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
@@ -6,14 +6,75 @@ longdesc scheme-infraonly or tlcritical, just a normal package.
docpattern f texmf-dist/scripts/texlive-extra/README
-runpattern f texmf-dist/scripts/texlive-extra/allcm.sh
-docpattern f texmf-dist/doc/man/man1/allcm.*
-binpattern f bin/${ARCH}/allcm
-#
# symlink to allcm.sh.
docpattern f texmf-dist/doc/man/man1/allec.*
binpattern f bin/${ARCH}/allec
#
-runpattern f texmf-dist/scripts/texlive-extra/allneeded.sh
-docpattern f texmf-dist/doc/man/man1/allneeded.*
+# symlinks to kpsetool.sh.
+docpattern f texmf-dist/doc/man/man1/kpsexpand.*
+binpattern f bin/${ARCH}/kpsexpand
+#
+docpattern f texmf-dist/doc/man/man1/kpsepath.*
+binpattern f bin/${ARCH}/kpsepath
+
+# texconfig support files.
+runpattern f texmf-dist/texconfig/*
+runpattern f texmf-dist/texconfig/g/*
+runpattern f texmf-dist/texconfig/v/*
+runpattern f texmf-dist/texconfig/x/*
+
+binpattern f bin/${ARCH}/allcm
+binpattern f bin/${ARCH}/allcm
binpattern f bin/${ARCH}/allneeded
+binpattern f bin/${ARCH}/allneeded
+binpattern f bin/${ARCH}/dvi2fax
+binpattern f bin/${ARCH}/dvired
+binpattern f bin/${ARCH}/e2pall
+binpattern f bin/${ARCH}/fontinst
+binpattern f bin/${ARCH}/kpsetool
+binpattern f bin/${ARCH}/kpsewhere
+binpattern f bin/${ARCH}/ps2frag
+binpattern f bin/${ARCH}/pslatex
+binpattern f bin/${ARCH}/rubibtex
+binpattern f bin/${ARCH}/rumakeindex
+binpattern f bin/${ARCH}/texconfig
+binpattern f bin/${ARCH}/texconfig-dialog
+binpattern f bin/${ARCH}/texconfig-sys
+binpattern f bin/${ARCH}/texlinks
+
+docpattern f texmf-dist/doc/man/man1/allcm.*
+docpattern f texmf-dist/doc/man/man1/allcm.*
+docpattern f texmf-dist/doc/man/man1/allneeded.*
+docpattern f texmf-dist/doc/man/man1/allneeded.*
+docpattern f texmf-dist/doc/man/man1/dvi2fax.*
+docpattern f texmf-dist/doc/man/man1/dvired.*
+docpattern f texmf-dist/doc/man/man1/e2pall.*
+docpattern f texmf-dist/doc/man/man1/fontinst.*
+docpattern f texmf-dist/doc/man/man1/kpsetool.*
+docpattern f texmf-dist/doc/man/man1/kpsewhere.*
+docpattern f texmf-dist/doc/man/man1/ps2frag.*
+docpattern f texmf-dist/doc/man/man1/pslatex.*
+docpattern f texmf-dist/doc/man/man1/rubibtex.*
+docpattern f texmf-dist/doc/man/man1/rumakeindex.*
+docpattern f texmf-dist/doc/man/man1/texconfig-sys.*
+docpattern f texmf-dist/doc/man/man1/texconfig.*
+docpattern f texmf-dist/doc/man/man1/texlinks.*
+
+runpattern f texmf-dist/scripts/texlive-extra/allcm.sh
+runpattern f texmf-dist/scripts/texlive-extra/allcm.sh
+runpattern f texmf-dist/scripts/texlive-extra/allneeded.sh
+runpattern f texmf-dist/scripts/texlive-extra/allneeded.sh
+runpattern f texmf-dist/scripts/texlive-extra/dvi2fax.sh
+runpattern f texmf-dist/scripts/texlive-extra/dvired.sh
+runpattern f texmf-dist/scripts/texlive-extra/e2pall.pl
+runpattern f texmf-dist/scripts/texlive-extra/fontinst.sh
+runpattern f texmf-dist/scripts/texlive-extra/kpsetool.sh
+runpattern f texmf-dist/scripts/texlive-extra/kpsewhere.sh
+runpattern f texmf-dist/scripts/texlive-extra/ps2frag.sh
+runpattern f texmf-dist/scripts/texlive-extra/pslatex.sh
+runpattern f texmf-dist/scripts/texlive-extra/rubibtex.sh
+runpattern f texmf-dist/scripts/texlive-extra/rumakeindex.sh
+runpattern f texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+runpattern f texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+runpattern f texmf-dist/scripts/texlive-extra/texconfig.sh
+runpattern f texmf-dist/scripts/texlive-extra/texlinks.sh
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 648de8ebdef..00190d6847a 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -6,25 +6,54 @@ longdesc tlmgr to run but still ours. Not included in tlcritical.
depend texlive.infra
#
docpattern f texmf-dist/scripts/texlive/README
-#
+
+# updmap support files.
+runpattern f texmf-dist/dvips/tetex/*
+runpattern f texmf-dist/fonts/enc/dvips/tetex/*
+runpattern f texmf-dist/fonts/map/dvips/tetex/*
+runpattern f texmf-dist/web2c/fmtutil-hdr.cnf
+runpattern f texmf-dist/web2c/updmap.cfg
+runpattern f texmf-dist/web2c/updmap-hdr.cfg
+# This two-entry map file was written by te and is maintained in the
+# tetex directory.
+execute addMap mathpple.map
+
+runpattern f texmf-dist/scripts/texlive/fmtutil-sys.sh
+runpattern f texmf-dist/scripts/texlive/fmtutil-user.sh
+runpattern f texmf-dist/scripts/texlive/fmtutil.pl
+runpattern f texmf-dist/scripts/texlive/mktexlsr.pl
runpattern f texmf-dist/scripts/texlive/mktexmf
runpattern f texmf-dist/scripts/texlive/mktexpk
runpattern f texmf-dist/scripts/texlive/mktextfm
runpattern f texmf-dist/scripts/texlive/rungs.tlu
+runpattern f texmf-dist/scripts/texlive/updmap-sys.sh
+runpattern f texmf-dist/scripts/texlive/updmap-user.sh
+runpattern f texmf-dist/scripts/texlive/updmap.pl
#
# scripts that symlink to the above:
+binpattern f bin/${ARCH}/fmtutil
+binpattern f bin/${ARCH}/fmtutil-sys
+binpattern f bin/${ARCH}/fmtutil-user
binpattern f bin/${ARCH}/mktexmf
binpattern f bin/${ARCH}/mktexpk
binpattern f bin/${ARCH}/mktextfm
-# links:
+binpattern f bin/${ARCH}/updmap
+binpattern f bin/${ARCH}/updmap-sys
+binpattern f bin/${ARCH}/updmap-user
+#
+# further links within bin:
binpattern f bin/${ARCH}/mktexfmt
binpattern f bin/${ARCH}/texhash
#
+docpattern f texmf-dist/doc/man/man1/fmtutil*
docpattern f texmf-dist/doc/man/man1/mktexfmt.*
docpattern f texmf-dist/doc/man/man1/mktexmf.*
docpattern f texmf-dist/doc/man/man1/mktexpk.*
docpattern f texmf-dist/doc/man/man1/mktextfm.*
docpattern f texmf-dist/doc/man/man1/texhash.*
+docpattern f texmf-dist/doc/man/man1/updmap*
+docpattern f texmf-dist/doc/man/man5/fmtutil.cnf.*
+docpattern f texmf-dist/doc/man/man5/updmap.*
#
binpattern f bin/${ARCH}/rungs
binpattern f bin/${ARCH}/man
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 3949a52c4e2..3b1d12b5601 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -24,13 +24,10 @@ runpattern f release-texlive.txt
#
runpattern f texmf-dist/scripts/texlive/mktexlsr
runpattern f texmf-dist/scripts/texlive/tlmgr.pl
-runpattern f texmf-dist/scripts/texlive/tlmgr.pl
runpattern f texmf-dist/scripts/texlive/tlmgrgui.pl
runpattern f texmf-dist/scripts/texlive/uninstall-win32.pl
runpattern f texmf-dist/scripts/texlive/uninstq.vbs
runpattern f texmf-dist/scripts/texlive/tl-errmess.vbs
-runpattern f texmf-dist/web2c/fmtutil-hdr.cnf
-runpattern f texmf-dist/web2c/updmap-hdr.cfg
#
runpattern f tlpkg/installer/config.guess
runpattern d tlpkg/TeXLive