summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl73
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl19
2 files changed, 46 insertions, 46 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 05b239b7d5d..c19504129c8 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -200,27 +200,27 @@ if (-r "installation.profile") {
process_logging_options();
# now the others
GetOptions(
- "custom-bin=s" => \$opt_custom_bin,
- "fancyselector" => \$::alternative_selector,
- "in-place" => \$opt_in_place,
- "gui:s" => \$opt_gui,
- "lang=s" => \$::opt_lang,
- "location|url|repository|repo=s" => \$opt_location,
- "no-cls", # $::opt_no_cls in install-menu-text-pl
- "no-gui" => \$opt_no_gui,
- "non-admin" => \$opt_nonadmin,
- "portable" => \$opt_portable,
- "print-platform|print-arch" => \$opt_print_arch,
- "force-platform|force-arch=s" => \$opt_force_arch,
- "debug-translation" => \$::debug_translation,
- "profile-seed=s" => \$opt_profileseed,
- "profile=s" => \$opt_profile,
- "scheme=s" => \$opt_scheme,
- "all-options" => \$::opt_all_options,
- "persistent-downloads!" => \$opt_persistent_downloads,
- "select-repository" => \$::opt_select_repository,
- "version" => \$opt_version,
- "help|?" => \$opt_help) or pod2usage(1);
+ "custom-bin=s" => \$opt_custom_bin,
+ "fancyselector" => \$::alternative_selector,
+ "in-place" => \$opt_in_place,
+ "gui:s" => \$opt_gui,
+ "lang=s" => \$::opt_lang,
+ "location|url|repository|repo=s" => \$opt_location,
+ "no-cls", # $::opt_no_cls in install-menu-text-pl
+ "no-gui" => \$opt_no_gui,
+ "non-admin" => \$opt_nonadmin,
+ "portable" => \$opt_portable,
+ "print-platform|print-arch" => \$opt_print_arch,
+ "force-platform|force-arch=s" => \$opt_force_arch,
+ "debug-translation" => \$::debug_translation,
+ "profile-seed=s" => \$opt_profileseed,
+ "profile=s" => \$opt_profile,
+ "scheme=s" => \$opt_scheme,
+ "all-options" => \$::opt_all_options,
+ "persistent-downloads!" => \$opt_persistent_downloads,
+ "select-repository" => \$::opt_select_repository,
+ "version" => \$opt_version,
+ "help|?" => \$opt_help) or pod2usage(1);
if ($opt_gui eq "") {
# the --gui option was given with an empty argument, set it to perltk
@@ -2050,27 +2050,25 @@ following modules are supported:
=item C<text>
-The text mode user interface which is the default on Unix systems, and
-can be forced with by giving C<text> as I<module>, or with the C<-no-gui>
-switch.
+The text mode user interface (default on Unix systems). Same as the
+C<-no-gui> option.
=item C<wizard>
-The wizard mode user interface asking only a few questions before installing
-all of TeX Live. This is the default on Windows systems.
+The wizard mode user interface (default on Windows), asking only minimal
+questions before installing all of TeX Live.
=item C<perltk>
-The expert GUI installer providing access to more options. It can also
-be selected by giving the C<-gui> option without any I<module>, or, on
-Windows by running C<install-tl-advanced.bat>.
+The expert GUI installer, providing access to more options.
+Can also be invoked on Windows by running C<install-tl-advanced.bat>.
=back
The C<perltk> and C<wizard> modules, and thus also when calling with a
-simple C<-gui> (without I<module>) requires
-the Perl/Tk module (L<http://tug.org/texlive/distro.html#perltk>); if
-Perl/Tk is not available, installation continues in text mode.
+bare C<-gui> (without I<module>), requires the Perl/Tk module
+(L<http://tug.org/texlive/distro.html#perltk>); if Perl/Tk is not
+available, installation continues in text mode.
=item B<-no-gui>
@@ -2129,11 +2127,12 @@ are accepted as aliases for this option.
=item B<-select-repository>
-In case the automatic mirror selection does not work out well, giving this
-option allows to select a mirror from the current list of CTAN mirrors.
-This option is supported in all installer modes (text, wizard, perltk)
-and will also offer to install from local media if found, and from
-a repository specified on the command line (see above).
+This option allows manual selection of a mirror from the current list of
+active CTAN mirrors. This option is supported in all installer modes
+(text, wizard, perltk), and will also offer to install from local media
+if available, or from a repository specified on the command line (see
+above). It's useful when the (default) automatic redirection does not
+choose a good host for you.
=item B<-all-options>
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 5f4c4e07b55..59cc7d3e0ef 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -2,7 +2,7 @@
# $Id$
# install-menu-txt.pl
#
-# Copyright 2007, 2008, 2009, 2010 Norbert Preining, Karl Berry
+# Copyright 2007, 2008, 2009, 2010, 2011 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.
@@ -117,7 +117,7 @@ sub run_menu_text {
# network is always available
my @mirror_list = TeXLive::TLUtils::create_mirror_list();
print "Please select a repository:\n";
- print "Network repositories:\n" if ($#media_available >= 0);
+ print "Network repositories:" if ($#media_available >= 0);
my @sel_to_index;
my $selind = 0;
# this is for 0 mirror.ctan.org, but it is printed last!
@@ -125,18 +125,19 @@ sub run_menu_text {
$selind++;
for my $i (0..$#mirror_list) {
if ($mirror_list[$i] !~ m/^ /) {
- print "$mirror_list[$i]\n";
+ print "\n$mirror_list[$i]\n";
} else {
+ print " " if 1 <= $selind && $selind <= 9; # align
print "[$selind] $mirror_list[$i]\n";
push @sel_to_index, $i;
$selind++;
}
}
- print "---\n";
+ print "----\n";
print "[0] default mirror - http://mirror.ctan.org\n";
my $local_ind = "a";
if ($#media_available >= 0) {
- print "Locally present repositories:\n";
+ print "Local repositories:\n";
# we have some local media present, propose to use it
for my $l (@media_available) {
my ($a, $b) = split ('#', $l);
@@ -154,7 +155,7 @@ sub run_menu_text {
$default = $local_ind;
$local_ind++;
} else {
- printf STDERR "Unknown media $l\n";
+ warn "$0: Unknown media $l";
}
}
}
@@ -180,7 +181,7 @@ sub run_menu_text {
print $selstr;
$ans = readline(*STDIN);
if (!defined($ans)) {
- print "Please select 'q' for quitting the program!\n";
+ print "Please select `q' to quit the program!\n";
} else {
chomp($ans);
$ans = $default if ($ans eq "");
@@ -203,10 +204,10 @@ sub run_menu_text {
$t =~ s/^[^#]*#//;
$::init_remote_needed = $t;
} elsif ($ans eq 'q' || $ans eq 'Q') {
- print "Good bye.\n";
+ print "Goodbye.\n";
exit 0;
} else {
- print "Not a valid answer.\n";
+ print "Not a valid answer: $ans.\n";
$ans = undef;
}
}