summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/installer
diff options
context:
space:
mode:
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/installer')
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl7
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl18
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/wget/wget.x86_64-darwinbin654416 -> 991776 bytes
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/xz/xz.x86_64-darwinbin207120 -> 435360 bytes
4 files changed, 12 insertions, 13 deletions
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 514a045530..7e96e837f0 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -18,7 +18,6 @@ $mirrors = {
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
'https://mirrors.cqu.edu.cn/CTAN/' => 1,
- 'https://mirrors.dgut.edu.cn/CTAN/' => 1,
'https://mirrors.hit.edu.cn/CTAN/' => 1,
'https://mirrors.nju.edu.cn/CTAN/' => 1,
'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
@@ -85,6 +84,7 @@ $mirrors = {
'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
'https://mirror.ibcp.fr/pub/CTAN/' => 1,
'https://mirrors.chevalier.io/CTAN/' => 1,
+ 'https://mirrors.ircam.fr/pub/CTAN/' => 1,
'https://texlive.mycozy.space/' => 1,
},
'Germany' => {
@@ -98,7 +98,6 @@ $mirrors = {
'https://ctan.mirror.norbert-ruehl.de/' => 1,
'https://ctan.net/' => 1,
'https://ctan.space-pro.be/tex-archive/' => 1,
- 'https://ftp.agdsn.de/pub/mirrors/latex/dante/' => 1,
'https://ftp.fau.de/ctan/' => 1,
'https://ftp.gwdg.de/pub/ctan/' => 1,
'https://ftp.rrze.uni-erlangen.de/ctan/' => 1,
@@ -171,6 +170,7 @@ $mirrors = {
'http://ctan.mirror.globo.tech/' => 1,
'http://ctan.mirror.rafal.ca/' => 1,
'https://ctan.math.ca/tex-archive/' => 1,
+ 'https://mirror.its.dal.ca/ctan/' => 1,
'https://muug.ca/mirror/ctan/' => 1,
},
'Costa Rica' => {
@@ -188,9 +188,6 @@ $mirrors = {
},
},
'Oceania' => {
- 'Australia' => {
- 'https://mirror.aarnet.edu.au/pub/CTAN/' => 1,
- },
'New Zealand' => {
'http://mirror.aut.ac.nz/CTAN/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
index d5db0f45c5..42de357b4f 100644
--- a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: install-menu-text.pl 53428 2020-01-16 23:29:27Z karl $
+# $Id: install-menu-text.pl 57583 2021-01-31 22:46:51Z karl $
# install-menu-txt.pl
#
# Copyright 2007-2020 Norbert Preining, Karl Berry
@@ -96,7 +96,6 @@ sub other_options {
my %opts=(
'-' => 'deselect all',
'+' => 'select all',
- 'H' => 'help',
'R' => 'return to main menu',
'P' => 'save installation profile to \'texlive.profile\' and exit',
'Q' => 'quit'
@@ -253,14 +252,14 @@ sub run_menu_text {
my $f = shift @args;
if ($f =~ m/^-old-installation-found=(.*)$/) {
my $dn = $1;
- print "\nAn old installation of TeX Live has been found in $dn\n";
+ print "\nAn existing installation of TeX Live has been found in $dn\n";
print "
-If you want the selection of schemes/collections and various options being
-taken over press `y', otherwise anything else.
+If you want its selection of schemes/collections and various options
+to be used, press `y', otherwise anything else.
Import settings from previous TeX Live installation: (y/n): ";
chomp(my $yn = <STDIN>);
- if ($yn =~ m/^y$/i) {
+ if (defined $yn && $yn =~ m/^y$/i) {
import_settings_from_old_tlpdb($dn);
}
}
@@ -710,6 +709,9 @@ sub html2text {
}
+# dumping the html doc to stdout does not seem very helpful,
+# and did not work for years with no one noticing, so this
+# function is no longer used.
sub help_menu {
my %command=(
'self' => \&help_menu,
@@ -1023,7 +1025,6 @@ sub main_menu {
my %command = (
'self' => \&main_menu,
'D' => \&directories_menu,
- 'H' => \&help_menu,
'I' => \&do_install,
'O' => \&options_menu,
'Q' => \&quit,
@@ -1042,6 +1043,7 @@ sub main_menu {
======> Letters/digits in <angle brackets> indicate <=======
======> menu items for actions or customizations <=======
+= help> https://tug.org/texlive/doc/install-tl.html <=======
Detected platform: $this_platform
$warn_nobin
@@ -1130,7 +1132,7 @@ EOF
print "\n <V> set up for portable installation\n";
}
- other_options qw(I P H Q);
+ other_options qw(I P Q);
my $answer = prompt 'Enter command';
if (defined $command{"\u$answer"}) {
diff --git a/systems/texlive/tlnet/tlpkg/installer/wget/wget.x86_64-darwin b/systems/texlive/tlnet/tlpkg/installer/wget/wget.x86_64-darwin
index 9b2f0f2d9d..bfc7fdec02 100755
--- a/systems/texlive/tlnet/tlpkg/installer/wget/wget.x86_64-darwin
+++ b/systems/texlive/tlnet/tlpkg/installer/wget/wget.x86_64-darwin
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/xz/xz.x86_64-darwin b/systems/texlive/tlnet/tlpkg/installer/xz/xz.x86_64-darwin
index 50696530c7..eb177d8722 100755
--- a/systems/texlive/tlnet/tlpkg/installer/xz/xz.x86_64-darwin
+++ b/systems/texlive/tlnet/tlpkg/installer/xz/xz.x86_64-darwin
Binary files differ