(-init-from-profile): rename from

-profile-seed. Alphabetize option lists.


git-svn-id: svn://tug.org/texlive/trunk@43981 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 23 insertions, 22 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 6aec4855112..a4ba70285e5 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -161,26 +161,27 @@ my %path_keys = (
 );
 
 # option handling
-our $opt_in_place = 0;
+my $opt_allow_ftp = 0;
+my $opt_custom_bin;
+my $opt_force_arch;
 my $opt_gui = (win32() ? "wizard" : "text");
 my $opt_help = 0;
+my $opt_init_from_profile = "";
 my $opt_location = "";
 my $opt_no_gui = 0;
 my $opt_nonadmin = 0;
+my $opt_persistent_downloads = 1;
 my $opt_portable = 0;
 my $opt_print_arch = 0;
-my $opt_profileseed = "";
 my $opt_profile = "";
 my $opt_scheme = "";
-my $opt_custom_bin;
 my $opt_version = 0;
-my $opt_force_arch;
-my $opt_persistent_downloads = 1;
-my $opt_allow_ftp = 0;
+my $opt_warn_checksums = 1;
+# unusual cases:
+$::opt_select_repository = 0;
+our $opt_in_place = 0;
 # don't set this to a value, see below
 my $opt_verify_downloads;
-$::opt_select_repository = 0;
-my $opt_warn_checksums = 1;
 
 # show all options even those not relevant for that arch
 $::opt_all_options = 0;
@@ -219,24 +220,24 @@ if (-r "installation.profile") {
 process_logging_options();
 # now the others
 GetOptions(
+           "all-options"                 => \$::opt_all_options,
            "custom-bin=s"                => \$opt_custom_bin,
+           "debug-translation"           => \$::debug_translation,
            "fancyselector"               => \$::alternative_selector,
-           "in-place"                    => \$opt_in_place,
+           "force-platform|force-arch=s" => \$opt_force_arch,
            "gui:s"                       => \$opt_gui,
+           "in-place"                    => \$opt_in_place,
+           "init-from-profile=s"         => \$opt_init_from_profile,
            "lang=s"                      => \$::opt_lang,
            "location|url|repository|repos|repo=s" => \$opt_location,
            "no-cls",                    # $::opt_no_cls in install-menu-text-pl
            "no-gui"                      => \$opt_no_gui,
            "non-admin"                   => \$opt_nonadmin,
+           "persistent-downloads!"       => \$opt_persistent_downloads,
            "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,
            "verify-downloads!"           => \$opt_verify_downloads,
            "version"                     => \$opt_version,
@@ -304,8 +305,8 @@ die "$0: Options custom-bin and in-place are incompatible.\n"
 die "$0: Options profile and in-place are incompatible.\n"
   if ($opt_in_place && $opt_profile);
 
-die "$0: Options profile-seed and in-place are incompatible.\n"
-  if ($opt_in_place && $opt_profileseed);
+die "$0: Options init-from-profile and in-place are incompatible.\n"
+  if ($opt_in_place && $opt_init_from_profile);
 
 if ($#ARGV >= 0) {
   # we still have arguments left, should only be gui, otherwise die
@@ -489,8 +490,8 @@ if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
 
 
 if ($opt_profile eq "") {
-  if ($opt_profileseed) {
-    read_profile("$opt_profileseed", seed => 1);
+  if ($opt_init_from_profile) {
+    read_profile("$opt_init_from_profile", seed => 1);
   }
   # do the normal interactive installation.
   #
@@ -1640,7 +1641,7 @@ END_EXPLICIT_MIRROR
       if $do_die;
   }
   # set the defaults to what is specified in the tlpdb
-  # since we might have loaded values via a -profile-seed,
+  # since we might have loaded values via -init-from-profile,
   # make sure that we don't overwrite default values
   for my $o (keys %TeXLive::TLConfig::TLPDBOptions) {
     $vars{"tlpdbopt_$o"} = $tlpdb->option($o)
@@ -2744,10 +2745,10 @@ Example: C<binary_x86_64-linux>
 
 =back
 
-=item B<-profile-seed> I<profile>
+=item B<-init-from-profile> I<profile>
 
-Like B<-profile>, but only seeds the installation configuration
-before starting the interactive session.
+Similar to B<-profile>, but merely initializes the installation
+configuration from I<profile> and then starts the interactive session.
 
 =item B<-q>