summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-perltk.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2011-09-17 07:40:33 +0000
committerNorbert Preining <preining@logic.at>2011-09-17 07:40:33 +0000
commit03fe8266f35acb30b86416f4c561943d568448f9 (patch)
tree5abae246f749745c8e08b074f3111f7e260ee182 /Master/tlpkg/installer/install-menu-perltk.pl
parente13715544ca359147db6341e6fdab863420608ab (diff)
installer and mirror selection
- don't show the terminal /systems/texlive/tlnet - allow for reselection in case of load failure git-svn-id: svn://tug.org/texlive/trunk@23990 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-perltk.pl')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl24
1 files changed, 18 insertions, 6 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 441e34f31c7..b829c81b88e 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -85,6 +85,7 @@ my $pathbutton;
my $deskintbutton;
my $assocbutton;
my $adminbutton;
+my $installbutton;
my $collectionstext;
my $texmflocaltext;
my $texmfsysvartext;
@@ -182,6 +183,7 @@ sub enable_buttons {
sub change_button_state {
my $what = shift;
+ $installbutton->configure(-state => $what);
$tmflocalbutton->configure(-state => $what);
$tmfsysvarbutton->configure(-state => $what);
$tmfsysconfigbutton->configure(-state => $what);
@@ -245,7 +247,7 @@ sub run_menu_perltk {
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, " " . __("Command line repository") . ": $b";
} else {
@@ -273,8 +275,11 @@ sub run_menu_perltk {
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)->grid(-row => $row, -column => 2, -sticky => 'w');
@@ -283,7 +288,14 @@ sub run_menu_perltk {
$::init_remote_needed = 1;
my $mfull = $mirror_entry;
only_load_remote($mfull);
- if (!do_version_agree()) {
+ if (!only_load_remote($mfull)) {
+ $fr->Dialog(-title => __("Warning"),
+ -text => __('Could not load remote TeX Live Database:') . $mfull
+ . "\n\n" .
+ __('Please select a different mirror.'),
+ -buttons => [ __("Ok") ])->Show;
+ $mirror_entry = "";
+ } elsif (!do_version_agree()) {
$fr->Dialog(-title => __("Warning"),
-text => __('The TeX Live versions of the local installation and the repository being accessed are not compatible:
local: %s
@@ -483,10 +495,10 @@ Please select a different mirror.', $TeXLive::TLConfig::ReleaseYear, $texlive_re
# install/cancel buttons
my $f3 = $fr->Frame;
- $f3->Button(
+ $installbutton = $f3->Button(
-text => __("Install TeX Live"),
- -command => sub { installation_window(); }
- )->pack(-side => 'left', -padx => "2m", -pady => "2m")->focus();
+ -command => sub { installation_window(); });
+ $installbutton->pack(-side => 'left', -padx => "2m", -pady => "2m")->focus();
my $quitbutton = $f3->Button(
-text => __("Quit"),
-command => \&menu_abort,