tl-update-auto

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

3 files changed, 26 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index def237545e8..a2d2579d899 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2018-09-06" "perl v5.28.0" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2018-11-22" "perl v5.28.0" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -2224,10 +2224,9 @@ These options allow selecting different download programs then the ones
 automatically selected by the installer. The order of selection is:
 .RS 4
 .IP "1." 8
-If the environment variable \f(CW\*(C`TEXLIVE_DOWNLOADER\*(C'\fR is
-defined, use it; abort if the specified program doesn't work.
-Possible values: \f(CW\*(C`curl\*(C'\fR, \f(CW\*(C`wget\*(C'\fR. The necessary options are added
-internally.
+If the environment variable \f(CW\*(C`TEXLIVE_DOWNLOADER\*(C'\fR is defined, use it;
+abort if the specified program doesn't work. Possible values: \f(CW\*(C`lwp\*(C'\fR,
+\&\f(CW\*(C`curl\*(C'\fR, \f(CW\*(C`wget\*(C'\fR. The necessary options are added internally.
 .IP "2." 8
 If the environment variable \f(CW\*(C`TL_DOWNLOAD_PROGRAM\*(C'\fR is
 defined (can be any value), use it together with
@@ -2242,13 +2241,32 @@ If wget is available (either from the system or \s-1TL\s0) and working, use that
 .RE
 .RS 4
 .Sp
-\&\s-1TL\s0 still provides \f(CW\*(C`wget\*(C'\fR binaries for some platforms, so
-some download method should always be available.
+\&\s-1TL\s0 provides \f(CW\*(C`wget\*(C'\fR binaries for platforms where necessary, so some
+download method should always be available.
 .RE
+.ie n .IP """TEXLIVE_PREFER_OWN""" 4
+.el .IP "\f(CWTEXLIVE_PREFER_OWN\fR" 4
+.IX Item "TEXLIVE_PREFER_OWN"
+By default, compression and download programs provided by the system,
+i.e., found along \f(CW\*(C`PATH\*(C'\fR are preferred over those shipped with TeX
+Live.
+.Sp
+This can create problems with systems that are too old, and so can be
+overridden by setting the environment variable \f(CW\*(C`TEXLIVE_PREFER_OWN\*(C'\fR to
+1. In this case, executables shipped with \s-1TL\s0 will be preferred.
+.Sp
+Extra compression/download programs not provided by \s-1TL,\s0 such as gzip,
+lwp, and curl, are still checked for on the system and used if
+available, per the above. \f(CW\*(C`TEXLIVE_PREFER_OWN\*(C'\fR only applies when the
+program being checked for is shipped with \s-1TL,\s0 namely the lz4 and
+xz compressors and wget downloader.
+.Sp
+Exception: on Windows, the \f(CW\*(C`tar.exe\*(C'\fR shipped with \s-1TL\s0 is always used,
+regardless of any setting.
 .SH "AUTHORS AND COPYRIGHT"
 .IX Header "AUTHORS AND COPYRIGHT"
 This script and its documentation were written for the TeX Live
 distribution (<http://tug.org/texlive>) and both are licensed under the
 \&\s-1GNU\s0 General Public License Version 2 or later.
 .PP
-\&\f(CW$Id:\fR tlmgr.pl 48598 2018\-09\-06 15:01:34Z preining $
+\&\f(CW$Id:\fR tlmgr.pl 49226 2018\-11\-22 23:37:16Z karl $
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index 73cc2db972f..c1165a3bb52 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index cc4366fecfc..70a60276260 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -15,7 +15,6 @@ $mirrors = {
       'http://mirror.lzu.edu.cn/CTAN/' => 1,
       'http://mirrors.geekpie.club/CTAN/' => 1,
       'http://mirrors.huaweicloud.com/repository/toolkit/CTAN/' => 1,
-      'http://mirrors.shu.edu.cn/CTAN/' => 1,
       'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1,
       'http://mirrors.ustc.edu.cn/CTAN/' => 1
     },
@@ -30,7 +29,6 @@ $mirrors = {
       'http://repo.iut.ac.ir/tex-archive/' => 1
     },
     'Japan' => {
-      'ftp://ftp.kddilabs.jp/CTAN/' => 1,
       'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
       'http://ftp.jaist.ac.jp/pub/CTAN/' => 1,
       'http://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1