From f554b581e6c5802cc7feffbe1718db7274d6d810 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 23 Jun 2009 15:28:45 +0000 Subject: install-tl: support overriding the detected architecture with -force-arch document this option, and fix documentation of the wizard and gui options git-svn-id: svn://tug.org/texlive/trunk@13918 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'Master') 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. =over 4 -=item B<-gui> [[=]I[:I,...]] +=item B<-gui> [[=]I] If no I 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 as I, or with the C<-no-gui> switch. -=item C - -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. - =item C -A new wizard like installation menu. This I allows selecting -specific pages of the wizard by giving them as I: +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 + +The all-in-one GUI installer. +It can also be selected by giving the C<-gui> option without any I. =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 + +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 Load the I file for repeated installations on different systems. -- cgit v1.2.3