diff options
| -rwxr-xr-x | Master/install-tl | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/Master/install-tl b/Master/install-tl index 4b168bd22b9..689d93353fe 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -133,7 +133,7 @@ our @collections_lang_doc; # 'option_fmt' => 0, # 'option_letter' => 0, our %vars=( # 'n_' means 'number of'. - 'this_platform' => platform(), + 'this_platform' => '', 'n_systems_available' => 0, 'n_systems_selected' => 0, 'n_collections_selected' => 0, @@ -159,6 +159,7 @@ my $opt_profile = ""; my $opt_scheme = ""; my $opt_custom_bin; my $opt_version = 0; +my $opt_force_arch; # default language for GUI installer $::lang = "en"; @@ -194,6 +195,7 @@ GetOptions( "non-admin" => \$opt_nonadmin, "portable" => \$opt_portable, "print-arch" => \$opt_print_arch, + "force-arch=s" => \$opt_force_arch, "profile-seed=s" => \$opt_profileseed, "profile=s" => \$opt_profile, "scheme=s" => \$opt_scheme, @@ -365,6 +367,12 @@ if ($location =~ m!^(ctan$|(http|ftp)://)!i) { } info("Installing from: $location\n"); +if (defined($opt_force_arch)) { + tlwarn("Overriding platform to $opt_force_arch\n"); + $::_platform_ = $opt_force_arch; +} +$vars{'this_platform'} = $::_platform_; + info("Platform: ", platform, " => \'", platform_desc(platform), "\'\n"); if ($opt_custom_bin) { if (-d $opt_custom_bin) { @@ -1686,7 +1694,7 @@ L<http://tug.org/texlive/doc/install-tl.html>. =over 4 -=item B<-gui> [[=]I<module>[:I<arg1>,...]] +=item B<-gui> [[=]I<module>] If no I<module> is given starts the default GUI installer (default on Windows). @@ -1702,17 +1710,15 @@ 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. -=item C<perltk> - -The all-in-one GUI installer which is the default on Windows. It is -also selected when giving the C<-gui> option without any I<module>. - =item C<wizard> -A new wizard like installation menu. This I<module> allows selecting -specific pages of the wizard by giving them as I<argN>: +The wizard mode user interface asking only a few questions before installing +all of TeX Live. This is the default on Windows systems. - -gui wizard:welcome,path,scheme,integration,install +=item C<perltk> + +The all-in-one GUI installer. +It can also be selected by giving the C<-gui> option without any I<module>. =back @@ -1786,6 +1792,12 @@ scripts instead of this option. See below for details. Print the detected arch-os combination and exit. +=item B<-force-arch> I<arch-os> + +Instead of auto-detecting the current platform use the one given on the +cmd line. Make sure that there are binaries for this platform and they +can actually be run. + =item B<-profile> I<profile> Load the I<profile> file for repeated installations on different systems. |