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.pl5
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl50
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl42
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/wget/wget.amd64-netbsdbin2078256 -> 495288 bytes
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/wget/wget.i386-netbsdbin1679316 -> 510772 bytes
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/xz/xz.universal-darwinbin435360 -> 451744 bytes
7 files changed, 76 insertions, 22 deletions
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 781f195f5c..da4bfb3507 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -1,8 +1,5 @@
$mirrors = {
'Africa' => {
- 'Morocco' => {
- 'https://mirror.marwan.ma/ctan/' => 1,
- },
'South Africa' => {
'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1,
'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
@@ -48,8 +45,6 @@ $mirrors = {
},
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
- 'https://cran.asia/tex/' => 1,
- 'https://ftp.harukasan.org/CTAN/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
'https://mirror.kakao.com/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl b/systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl
index 24a4d617d9..4dd16ade9c 100644
--- a/systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl
@@ -83,6 +83,7 @@ sub read_vars {
if ($l =~ /^([^:]+): (.*)$/) {
$vars{$1} = $2;
} elsif ($l eq 'endvars') {
+ $vars{'free_size'} = TeXLive::TLUtils::diskfree($vars{'TEXDIR'});
return 1;
} else {
return 0;
diff --git a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
index a7409f146e..bcf7003b00 100644
--- a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
@@ -1,15 +1,15 @@
#!/usr/bin/env perl
-# $Id: install-menu-text.pl 57970 2021-02-27 14:17:34Z siepo $
-# install-menu-txt.pl
+# $Id: install-menu-text.pl 62571 2022-03-09 22:53:42Z karl $
#
-# Copyright 2007-2021 Norbert Preining, Karl Berry
+# Copyright 2007-2022 Norbert Preining, Karl Berry
# Copyright 2007-2008 Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
# This file implements the text based menu system for the TeX Live installer.
-use vars qw(@::end_install_hook $::opt_no_cls);
+use vars qw(@::end_install_hook
+ $::opt_no_cls $::opt_select_repository $::run_menu);
our %vars;
our $opt_in_place;
@@ -239,7 +239,7 @@ sub run_menu_text {
warn "\n";
warn "Please select a different mirror! See info above.\n";
print STDERR "Press Enter to exit... ";
- $ans = readline (*STDIN);
+ my $ans = readline (*STDIN);
exit (1);
}
@@ -545,6 +545,10 @@ EOF
if ("\u$answer" eq '1' and !$opt_in_place) {
print "New value for TEXDIR [$vars{'TEXDIR'}]: ";
$answer = &input_dirname ();
+ # update free space information
+ if ($answer ne $vars{'TEXDIR'}) {
+ $vars{'free_size'} = TeXLive::TLUtils::diskfree($answer);
+ }
$vars{'TEXDIR'} = $answer if $answer ne "";
my $texdirnoslash;
if ($vars{'TEXDIR'}=~/^(.*)\/$texlive_release$/) {
@@ -715,7 +719,7 @@ sub help_menu {
'R' => \&main_menu,
'Q' => \&quit
);
- my $installer_help="$installerdir/tlpkg/installer/install-tl.html";
+ my $installer_help = "notused/tlpkg/installer/install-tl.html";
clear_screen;
@@ -958,7 +962,36 @@ sub quit {
}
sub do_install {
- $RETURN = $MENU_INSTALL;
+ my $reserve = 100;
+ my $doit = 1;
+ if ($vars{'free_size'} > 0
+ && $vars{'free_size'} + $reserve < $vars{'total_size'}) {
+ print STDERR <<"EOF";
+*** WARNING ****************************************************
+The installation requires $vars{'total_size'}M of disk space
+but only $vars{'free_size'}M is available.
+
+You probably want to either clean up the destination filesystem,
+or choose a different installation location,
+or reduce what gets installed.
+
+Press Enter to return to the menu, or i to install anyway.
+****************************************************************
+EOF
+ my $ans = readline (*STDIN);
+ $doit = 0;
+ chomp($ans);
+ if ($ans eq "i" or $ans eq "I") {
+ $doit = 1;
+ }
+ }
+ if ($doit) {
+ # set env variable to make install-tl not trip over
+ $ENV{'TEXLIVE_INSTALL_NO_DISKCHECK'} = 1;
+ $RETURN = $MENU_INSTALL;
+ } else {
+ main_menu();
+ }
}
sub toggle_portable {
@@ -1035,6 +1068,7 @@ sub main_menu {
}
clear_screen;
+ my $freestring = ($vars{'free_size'} >= 0 ? " (free: $vars{'free_size'} MB)" : "");
print <<"EOF";
======================> TeX Live installation procedure <=====================
@@ -1053,7 +1087,7 @@ EOF
<S> set installation scheme: $vars{'selected_scheme'}
<C> set installation collections:
- $vars{'n_collections_selected'} collections out of $vars{'n_collections_available'}, disk space required: $vars{'total_size'} MB
+ $vars{'n_collections_selected'} collections out of $vars{'n_collections_available'}, disk space required: $vars{'total_size'} MB$freestring
EOF
}
diff --git a/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl b/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
index bd17b56147..e654ce1b68 100755
--- a/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
+++ b/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
@@ -1,6 +1,6 @@
#!/usr/bin/env wish
-# Copyright 2018-2021 Siep Kroonenberg
+# Copyright 2018-2022 Siep Kroonenberg
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -557,6 +557,7 @@ proc commit_root {} {
set ::vars(TEXMFCONFIG) $::vars(TEXMFSYSCONFIG)
}
destroy .tltd
+ update_vars
}
### main directory dialog ###
@@ -594,7 +595,8 @@ proc texdir_setup {} {
-in .tltd.fr1 -row $rw -column 4
# corresponding buttons
incr rw
- pgrid [ttk::button .tltd.prefix_b -text [__ "Browse..."] \
+ set prefix_text [__ "Prefix"]
+ pgrid [ttk::button .tltd.prefix_b -text "${prefix_text}... \u00B9" \
-command {if [dirbrowser2widget .tltd.prefix_l] update_full_path}] \
-in .tltd.fr1 -row $rw -column 0
pgrid [ttk::button .tltd.name_b -text [__ "Change"] -command edit_name] \
@@ -603,12 +605,18 @@ proc texdir_setup {} {
-command toggle_rel] \
-in .tltd.fr1 -row $rw -column 4
+ set note_text [__ "Prefix must exist"]
+ ppack [ttk::label .tltd.notes -text "\u00B9 ${note_text}"] \
+ -in .tltd.bg -fill x -anchor w
+
# windows: note about localized names
if {$::tcl_platform(platform) eq "windows"} {
- ttk::label .tltd.loc -anchor w
- .tltd.loc configure -text \
- [__ "Localized directory names will be replaced by their real names"]
- ppack .tltd.loc -in .tltd.bg -fill x
+ .tltd.prefix_b configure -text "${prefix_text}... \u00B9 \u00B2"
+ set loc_text \
+ [__ "Localized directory names will be replaced by their real names"]
+ .tltd.notes configure -justify left \
+ -text "\u00B9 ${note_text}\n\u00B2 ${loc_text}"
+ ppack .tltd.notes -in .tltd.bg -fill x
}
# ok/cancel buttons
@@ -1301,6 +1309,15 @@ proc abort_menu {} {
# i.e. anything but advanced, alltrees or startinst
}
+proc maybe_install {} {
+ if {($::vars(free_size)!=-1) && \
+ ($::vars(total_size) >= ($::vars(free_size)-100))} {
+ tk_messageBox -icon error -message [__ "Not enough room"]
+ } else {
+ set ::menu_ans "startinst"
+ }
+}
+
proc run_menu {} {
#if [info exists ::env(dbgui)] {
# puts "\ndbgui: run_menu: advanced is now $::advanced"
@@ -1384,8 +1401,8 @@ proc run_menu {} {
# frame at bottom with install/quit buttons
pack [ttk::frame .final] \
-in .bg -side bottom -pady {5pt 2pt} -fill x
- ppack [ttk::button .install -text [__ "Install"] -command {
- set ::menu_ans "startinst"}] -in .final -side right
+ ppack [ttk::button .install -text [__ "Install"] -command maybe_install] \
+ -in .final -side right
ppack [ttk::button .quit -text [__ "Quit"] -command {
set ::out_log {}
set ::menu_ans "no_inst"}] -in .final -side right
@@ -1570,7 +1587,7 @@ proc run_menu {} {
-in .selsf -row $rw -column 2 -sticky e
}
- # total size
+ # total size and available space
# curf: current frame
set curf [expr {$::advanced ? ".selsf" : ".dirf"}]
incr rw
@@ -1578,6 +1595,13 @@ proc run_menu {} {
ttk::label .size_req -textvariable ::vars(total_size)
pgrid .lsize -in $curf -row $rw -column 0 -sticky w
pgrid .size_req -in $curf -row $rw -column 1 -sticky w
+ if {$::vars(free_size) != -1} {
+ incr rw
+ ttk::label .lavail -text [__ "Disk space available (in MB):"]
+ ttk::label .avail -textvariable ::vars(free_size)
+ pgrid .lavail -in $curf -row $rw -column 0 -sticky w
+ pgrid .avail -in $curf -row $rw -column 1 -sticky w
+ }
########################################################
# right side: options
diff --git a/systems/texlive/tlnet/tlpkg/installer/wget/wget.amd64-netbsd b/systems/texlive/tlnet/tlpkg/installer/wget/wget.amd64-netbsd
index eb7145a594..98c5305c0e 100755
--- a/systems/texlive/tlnet/tlpkg/installer/wget/wget.amd64-netbsd
+++ b/systems/texlive/tlnet/tlpkg/installer/wget/wget.amd64-netbsd
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/wget/wget.i386-netbsd b/systems/texlive/tlnet/tlpkg/installer/wget/wget.i386-netbsd
index 0af0ff8160..5d94c0f9d9 100755
--- a/systems/texlive/tlnet/tlpkg/installer/wget/wget.i386-netbsd
+++ b/systems/texlive/tlnet/tlpkg/installer/wget/wget.i386-netbsd
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/xz/xz.universal-darwin b/systems/texlive/tlnet/tlpkg/installer/xz/xz.universal-darwin
index eb177d8722..d32e92f96a 100755
--- a/systems/texlive/tlnet/tlpkg/installer/xz/xz.universal-darwin
+++ b/systems/texlive/tlnet/tlpkg/installer/xz/xz.universal-darwin
Binary files differ