summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-wizard.pl
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/installer/install-menu-wizard.pl')
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl16
1 files changed, 11 insertions, 5 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index 6109ed27fa1..737d2cee972 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -233,7 +233,7 @@ sub ask_mirror {
for my $l (@media_available) {
my ($a, $b) = split ('#', $l);
if ($a eq 'local_compressed' || $a eq 'local_uncompressed') {
- push @loclst, " $b";
+ push @loclst, " $b";
} elsif ($a eq 'NET') {
#push @netlst, " cmd line repository: $b";
push @netlst, " " . __("Command line repository") . ": $b";
@@ -258,7 +258,7 @@ sub ask_mirror {
$fmain->Label(-text => __("Mirror:"))->place(-x => 0, -y => 50);
$fmain->BrowseEntry(-state => 'readonly',
-listheight => 12,
- -listwidth => 600,
+ -listwidth => 400,
-width => 35,
-autolistwidth => 1,
-choices => \@mirror_list,
@@ -266,8 +266,11 @@ sub ask_mirror {
sub {
if ($mirror_entry !~ m/^ /) {
$mirror_entry = "";
- } else {
+ } elsif ($mirror_entry =~ m!(http|ftp)://!) {
$mirror_entry = TeXLive::TLUtils::extract_mirror_entry($mirror_entry);
+ } else {
+ $mirror_entry =~ s/^\s*//;
+ # $mirror_entry = TeXLive::TLUtils::extract_mirror_entry($mirror_entry);
}
},
-variable => \$mirror_entry)->place(-x => 150, -y => 50);
@@ -388,8 +391,11 @@ sub load_remote_screen {
$nxt->configure(-text => __('Cancel'),
-command => sub { $return = $MENU_ABORT; $mw->destroy; });
$mw->update;
- only_load_remote($remote_path);
- if (!do_version_agree()) {
+ if (!only_load_remote($remote_path)) {
+ $labela->configure(-text => __('Could not load remote TeX Live Database:') . $remote_path);
+ $labelb->configure(-text => __('Please go back and select a different mirror.'));
+ $prv->configure(-text => __('< Back'), -command => \&reset_start );
+ } elsif (!do_version_agree()) {
$labela->configure(-text => __('The TeX Live versions of the local installation
and the repository being accessed are not compatible:
local: %s