diff options
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/install-tl.1 | 49 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/install-tl.man1.pdf | bin | 50835 -> 52091 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/tlmgr.1 | 56 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf | bin | 137008 -> 136483 bytes | |||
| -rw-r--r-- | Master/tlpkg/installer/ctan-mirrors.pl | 5 |
5 files changed, 61 insertions, 49 deletions
diff --git a/Master/texmf-dist/doc/man/man1/install-tl.1 b/Master/texmf-dist/doc/man/man1/install-tl.1 index 99de00e29c7..1f791b94881 100644 --- a/Master/texmf-dist/doc/man/man1/install-tl.1 +++ b/Master/texmf-dist/doc/man/man1/install-tl.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "INSTALL-TL 1" -.TH INSTALL-TL 1 "2018-06-01" "perl v5.26.2" "User Contributed Perl Documentation" +.TH INSTALL-TL 1 "2018-06-02" "perl v5.26.2" "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 @@ -226,7 +226,7 @@ simplified Chinese (zh_CN), and traditional Chinese (zh_TW). .IP "\fB\-repository\fR \fIurl|path\fR" 4 .IX Item "-repository url|path" Specify the package repository to be used as the source of the -installation, either a local directory via \f(CW\*(C`/path/to/directory\*(C'\fR or a +installation: either a local directory via \f(CW\*(C`/path/to/directory\*(C'\fR or a \&\f(CW\*(C`file:/\*(C'\fR url, or a network location. .Sp The default is to pick a mirror automatically, using @@ -264,6 +264,48 @@ will be adjusted accordingly. .Sp For backward compatibility and convenience, \f(CW\*(C`\-\-location\*(C'\fR and \f(CW\*(C`\-\-repo\*(C'\fR are accepted as aliases for this option. +.Sp +Network locations can be specified as any of the following: +.RS 4 +.ie n .IP """http://server/path/to/tlnet""" 4 +.el .IP "\f(CWhttp://server/path/to/tlnet\fR" 4 +.IX Item "http://server/path/to/tlnet" +Standard \s-1HTTP.\s0 If the (default) \s-1LWP\s0 method is used, persistent +connections are supported. \s-1TL\s0 can also use \f(CW\*(C`curl\*(C'\fR or \f(CW\*(C`wget\*(C'\fR to do the +downloads, or an arbitrary user-specified program, as described in the +\&\f(CW\*(C`tlmgr\*(C'\fR documentation +(<http://tug.org/texlive/doc/tlmgr.html#ENVIRONMENT\-VARIABLES).> +.ie n .IP """ftp://server/path/to/tlnet""" 4 +.el .IP "\f(CWftp://server/path/to/tlnet\fR" 4 +.IX Item "ftp://server/path/to/tlnet" +If the (default) \s-1LWP\s0 method is used, persistent connections are +supported. +.ie n .IP """https://server/path/to/tlnet""" 4 +.el .IP "\f(CWhttps://server/path/to/tlnet\fR" 4 +.IX Item "https://server/path/to/tlnet" +Again, if the (default) \s-1LWP\s0 method is used, this schema supports +persistent connections. Some versions of \f(CW\*(C`wget\*(C'\fR do not support https, +and even when \f(CW\*(C`wget\*(C'\fR supports https, certificates may be rejected even +when the certificate is fine, due to a lack of local certificate roots. +Ditto for \f(CW\*(C`curl\*(C'\fR. +.ie n .IP """user@machine:/path/to/tlnet""" 4 +.el .IP "\f(CWuser@machine:/path/to/tlnet\fR" 4 +.IX Item "user@machine:/path/to/tlnet" +.PD 0 +.ie n .IP """scp://user@machine/path/to/tlnet""" 4 +.el .IP "\f(CWscp://user@machine/path/to/tlnet\fR" 4 +.IX Item "scp://user@machine/path/to/tlnet" +.ie n .IP """ssh://user@machine/path/to/tlnet""" 4 +.el .IP "\f(CWssh://user@machine/path/to/tlnet\fR" 4 +.IX Item "ssh://user@machine/path/to/tlnet" +.PD +These url-like schemata use \f(CW\*(C`scp\*(C'\fR to transfer files. The use of an +\&\f(CW\*(C`ssh\-agent\*(C'\fR is highly recommended. (Info: +<https://en.wikipedia.org/wiki/OpenSSH>, +<https://en.wikipedia.org/wiki/Ssh\-agent>.) +.RE +.RS 4 +.RE .IP "\fB\-select\-repository\fR" 4 .IX Item "-select-repository" This option allows manual selection of a mirror from the current list of @@ -546,7 +588,8 @@ user installations. .IX Item "TL_DOWNLOAD_ARGS" .PD These override the normal choice of a download program; see the \f(CW\*(C`tlmgr\*(C'\fR -documentation, e.g., <http://tug.org/texlive/doc/tlmgr.html#xxx> +documentation, e.g., +<http://tug.org/texlive/doc/tlmgr.html#ENVIRONMENT\-VARIABLES>. .ie n .IP """TEXLIVE_INSTALL_ENV_NOCHECK""" 4 .el .IP "\f(CWTEXLIVE_INSTALL_ENV_NOCHECK\fR" 4 .IX Item "TEXLIVE_INSTALL_ENV_NOCHECK" diff --git a/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf b/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf Binary files differindex 66a4a131f63..77509798b09 100644 --- a/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1 index 6c4fe099cf9..e5a92defdc0 100644 --- a/Master/texmf-dist/doc/man/man1/tlmgr.1 +++ b/Master/texmf-dist/doc/man/man1/tlmgr.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "TLMGR 1" -.TH TLMGR 1 "2018-05-30" "perl v5.26.2" "User Contributed Perl Documentation" +.TH TLMGR 1 "2018-06-02" "perl v5.26.2" "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 @@ -207,9 +207,12 @@ between an option name and its value. Specifies the package repository from which packages should be installed or updated, overriding the default package repository found in the installation's TeX Live Package Database (a.k.a. the \s-1TLPDB,\s0 defined -entirely in the file \f(CW\*(C`tlpkg/texlive.tlpdb\*(C'\fR). The documentation for -\&\f(CW\*(C`install\-tl\*(C'\fR has more details about this -(<http://tug.org/texlive/doc/install\-tl.html>). +entirely in the file \f(CW\*(C`tlpkg/texlive.tlpdb\*(C'\fR). +.Sp +The documentation for \f(CW\*(C`install\-tl\*(C'\fR has more details about this +(<http://tug.org/texlive/doc/install\-tl.html#OPTIONS>). In short, you can +specify a directory name, http(s) or ftp url, or +\&\f(CW\*(C`scp://user@machine/path/to/tlnet\*(C'\fR. .Sp \&\f(CW\*(C`\-\-repository\*(C'\fR changes the repository location only for the current run; to make a permanent change, use \f(CW\*(C`option repository\*(C'\fR (see the @@ -217,8 +220,6 @@ run; to make a permanent change, use \f(CW\*(C`option repository\*(C'\fR (see th .Sp For backward compatibility and convenience, \f(CW\*(C`\-\-location\*(C'\fR and \f(CW\*(C`\-\-repo\*(C'\fR are accepted as aliases for this option. -.Sp -See \*(L"\s-1SUPPORTED URL SCHEMATA\*(R"\s0 for details on the supported schemata. .IP "\fB\-\-gui\fR [\fIaction\fR]" 4 .IX Item "--gui [action]" \&\f(CW\*(C`tlmgr\*(C'\fR has a graphical interface as well as the command line @@ -2089,43 +2090,11 @@ If a value is not saved in the database the string \f(CW\*(C`(not set)\*(C'\fR i .PP If you are developing a program that uses this output, and find that changes would be helpful, do not hesitate to write the mailing list. -.SH "SUPPORTED URL SCHEMATA" -.IX Header "SUPPORTED URL SCHEMATA" -The following \s-1URL\s0 schemata are supported -.ie n .IP """http://server/path/to/tlnet""" 4 -.el .IP "\f(CWhttp://server/path/to/tlnet\fR" 4 -.IX Item "http://server/path/to/tlnet" -Standard schema, is supported without any restrictions. If the (default) -\&\s-1LWP\s0 method is used, this schema supports persistent connections. -.ie n .IP """ftp://server/path/to/tlnet""" 4 -.el .IP "\f(CWftp://server/path/to/tlnet\fR" 4 -.IX Item "ftp://server/path/to/tlnet" -If the (default) \s-1LWP\s0 method is used, this schema supports persistent connections. -.ie n .IP """https://server/path/to/tlnet""" 4 -.el .IP "\f(CWhttps://server/path/to/tlnet\fR" 4 -.IX Item "https://server/path/to/tlnet" -If the (default) \s-1LWP\s0 method is used, this schema supports persistent connections. -Some versions of \f(CW\*(C`wget\*(C'\fR do not support this schema. Furthermore, even if -\&\f(CW\*(C`wget\*(C'\fR supports https, it might check the certificate. \f(CW\*(C`curl\*(C'\fR generally -supports https. -.ie n .IP """user@machine:/path/to/tlnet""" 4 -.el .IP "\f(CWuser@machine:/path/to/tlnet\fR" 4 -.IX Item "user@machine:/path/to/tlnet" -.PD 0 -.ie n .IP """scp://user@machine/path/to/tlnet""" 4 -.el .IP "\f(CWscp://user@machine/path/to/tlnet\fR" 4 -.IX Item "scp://user@machine/path/to/tlnet" -.ie n .IP """ssh://user@machine/path/to/tlnet""" 4 -.el .IP "\f(CWssh://user@machine/path/to/tlnet\fR" 4 -.IX Item "ssh://user@machine/path/to/tlnet" -.PD -These schemata use \f(CW\*(C`scp\*(C'\fR to transfer files. The use of an \f(CW\*(C`ssh\-agent\*(C'\fR -is highly recommended. .SH "ENVIRONMENT VARIABLES" .IX Header "ENVIRONMENT VARIABLES" -For ease in scripting and debugging, \f(CW\*(C`install\-tl\*(C'\fR will look for the -following environment variables. They are not of interest for normal -user installations. +For ease in scripting and debugging, \f(CW\*(C`tlmgr\*(C'\fR looks for the following +environment variables. They are not of interest for normal user +installations. .ie n .IP """TEXLIVE_COMPRESSOR""" 4 .el .IP "\f(CWTEXLIVE_COMPRESSOR\fR" 4 .IX Item "TEXLIVE_COMPRESSOR" @@ -2135,7 +2104,7 @@ backups and intermediate rollback containers. The order of selection is: .IP "1." 8 If the environment variable \f(CW\*(C`TEXLIVE_COMPRESSOR\*(C'\fR is defined, use it; abort if it doesn't work. Possible values: -\&\f(CW\*(C`lz4\*(C'\fR, \f(CW\*(C`gzip\*(C'\fR, \f(CW\*(C`xz\*(C'\fR. +\&\f(CW\*(C`lz4\*(C'\fR, \f(CW\*(C`gzip\*(C'\fR, \f(CW\*(C`xz\*(C'\fR. The necessary options are added internally. .IP "2." 8 If lz4 is available (either from the system or \s-1TL\s0) and working, use that. .IP "3." 8 @@ -2166,7 +2135,8 @@ automatically selected by the installer. The order of selection is: .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. +Possible values: \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 diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf Binary files differindex 8f7652a37e7..d3564c35a0d 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 beb5543770b..b664e73f96a 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -17,11 +17,11 @@ $mirrors = { 'http://mirrors.geekpie.club/CTAN/' => 1, 'http://mirrors.huaweicloud.com/repository/toolkit/CTAN/' => 1, 'http://mirrors.shu.edu.cn/CTAN/' => 1, - 'http://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1, 'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1, 'http://mirrors.ustc.edu.cn/CTAN/' => 1 }, 'India' => { + 'http://ctan.imsc.res.in/' => 1, 'http://mirror.iopb.res.in/tex-archive/' => 1 }, 'Iran' => { @@ -168,8 +168,7 @@ $mirrors = { 'http://mirror.utexas.edu/ctan/' => 1, 'http://mirrors.concertpass.com/tex-archive/' => 1, 'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1, - 'http://mirrors.rit.edu/CTAN/' => 1, - 'http://mirrors.sorengard.com/ctan/' => 1 + 'http://mirrors.rit.edu/CTAN/' => 1 } }, 'Oceania' => { |