platform vs. arch

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

2 files changed, 70 insertions, 67 deletions

diff --git a/Master/install-tl b/Master/install-tl
index b268ce21320..3469697aee1 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -203,19 +203,19 @@ GetOptions(
            "from_dvd"       => \$opt_from_dvd,
            "gui:s"          => \$opt_gui,
            "lang=s"         => \$::opt_lang,
-           "location|url|repository|repo=s" => \$opt_location,
+           "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-arch"     => \$opt_print_arch,
-           "force-arch=s"   => \$opt_force_arch,
+           "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,
+           "persistent-downloads!"		=> \$opt_persistent_downloads,
            "version"        => \$opt_version,
            "help|?"         => \$opt_help) or pod2usage(1);
 
@@ -2049,31 +2049,77 @@ are accepted as aliases for this option.
 (only for text mode installer) do not clear the screen when entering
 a new menu (for debugging purposes).
 
-=item B<-non-admin>
-
-For Windows only: configure for the current user, not for all users.
-
 =item B<-all-options>
 
 Normally options not regarding the current platform are not shown.
 Giving this cmd line option allows to configure settings in the
 final tlpdb that do not have any immediate effect.
 
+=item B<-custom-bin> I<path>
+
+If you have built your own binaries for your system (probably because
+your platform was not supported by TeX Live out of the box), this option
+allows you to give the I<path> to a directory where the binaries for the
+current system are present. The installation will continue as usual, but
+at the end all files from I<path> are copied over to C<bin/custom> in
+your installation folder and this directory will be added to the path
+for the post-install actions.
+
+=item B<-debug-translation>
+
+In GUI mode, this switch makes C<tlmgr> report any missing, or more
+likely untranslated, messages to standard error.  Helpful for
+translators to see what remains to be done.
+
+=item B<--help>, B<-help>, B<-?>
+
+Display this help and exit.
+
+=item B<-logfile> I<file>
+
+Write both all messages (informational, debugging, warnings) to I<file>,
+in addition to standard output or standard error.
+
+If this option is not given, the installer will create a log file
+in the root of the writable installation tree,
+for example, C</usr/local/texlive/YYYY/install-tl.log> for the I<YYYY>
+release.
+
+=item B<-force-platform> I<platform>
+
+Instead of auto-detecting the current platform, use I<platform>.
+Binaries for this platform must be present and they must actually be
+runnable, or installation will fail.  C<-force-arch> is a synonym.
+
+=item B<-non-admin>
+
+For Windows only: configure for the current user, not for all users.
+
+=item B<--persistent-downloads>
+
+=item B<--no-persistent-downloads>
+
+For net installs, activating this option makes the installer try to set up a
+persistent connection using the Net::LWP Perl module.  
+This opens only one connection between your computer and the server 
+per session and reuses it, instead of initiating a new download for
+each package.  
+
+This option is turned on by default, and the installation program will
+fall back to using wget if this is not possible. If you want to disable 
+usage of LWP and persistent connections, please use
+B<--no-persistent-downloads>.
+
 =item B<-portable>
 
 Start the installer for portable use---but use the C<tl-portable>
 scripts instead of this option.  See below for details.
 
-=item B<-print-arch>
+=item B<-print-platform>
 
 Print the TeX Live identifier for the detected platform
 (hardware/operating system) combination to standard output, 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.
+C<-print-arch> is a synonym.
 
 =item B<-profile> I<profile>
 
@@ -2097,6 +2143,10 @@ together with the definitions of the paths (C<TEXDIR>, C<TEXDIRW>,
 C<TEXMFHOME>, C<TEXMFLOCAL>, C<TEXMFSYSCONFIG>, C<TEXMFSYSVAR>) suffices
 to install the medium scheme with all default options.
 
+=item B<-q>
+
+Omit normal informational messages.
+
 =item B<-scheme> I<scheme>
 
 Schemes are the highest level of package grouping in TeX Live; the
@@ -2107,60 +2157,11 @@ optionally have a prefix C<scheme->.  The list of supported scheme names
 depends on what your package repository provides; see the interactive
 menu list.
 
-=item B<-custom-bin> I<path>
-
-If you have built your own binaries for your system (probably because
-your platform was not supported by TeX Live out of the box), this option
-allows you to give the I<path> to a directory where the binaries for the
-current system are present. The installation will continue as usual, but
-at the end all files from I<path> are copied over to C<bin/custom> in
-your installation folder and this directory will be added to the path
-for the post-install actions.
-
-=item B<--persistent-downloads>
-
-=item B<--no-persistent-downloads>
-
-For net installs, activating this option makes the installer try to set up a
-persistent connection using the Net::LWP Perl module.  
-This opens only one connection between your computer and the server 
-per session and reuses it, instead of initiating a new download for
-each package.  
-
-This option is turned on by default, and the installation program will
-fall back to using wget if this is not possible. If you want to disable 
-usage of LWP and persistent connections, please use
-B<--no-persistent-downloads>.
-
-=item B<-debug-translation>
-
-In GUI mode, this switch makes C<tlmgr> report any missing, or more
-likely untranslated, messages to standard error.  Helpful for
-translators to see what remains to be done.
-
-=item B<-q>
-
-Omit normal informational messages.
-
 =item B<-v>
 
 Include debugging messages; repeat for maximum debugging, as in C<-v
 -v>.  (Further repeats are accepted but ignored.)
 
-=item B<-logfile> I<file>
-
-Write both all messages (informational, debugging, warnings) to I<file>,
-in addition to standard output or standard error.
-
-If this option is not given, the installer will create a log file
-in the root of the writable installation tree,
-for example, C</usr/local/texlive/YYYY/install-tl.log> for the I<YYYY>
-release.
-
-=item B<--help>, B<-help>, B<-?>
-
-Display this help and exit.
-
 =item B<--version>, B<-version>
 
 Output version information and exit.
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index a5be49d541d..185e9a34c6c 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -135,7 +135,6 @@ sub main {
     "help|h|?" => 1);
 
   my %actionoptions = (
-    "platform"      => { "dry-run|n" => 1 },
     "backup"        => { "backupdir" => "=s",
                          "clean" => ":-99",
                          "all" => 1,
@@ -153,6 +152,7 @@ sub main {
     "list"          => { "only-installed" => 1 },
     "paper"         => { "list" => 1 },
     "path"          => { "w32mode" => "=s" },
+    "platform"      => { "dry-run|n" => 1 },
     "postaction"    => { "w32mode" => "=s",
                          "all" => 1,
                          "fileassocmode" => "=i" },
@@ -5286,7 +5286,7 @@ settings for some programs, notably C<dvips>.  C<tlmgr> does not support
 those extra settings at present.
 
 
-=head2 platform list|add|remove I<arch>...
+=head2 platform list|add|remove I<platform>...
 
 C<platform list> lists the TeX Live names of all the platforms
 (a.k.a. architectures), (C<i386-linux>, ...) available at the package
@@ -5299,6 +5299,8 @@ C<platform remove> I<platform>... removes the executables for each given
 platform I<platform> from the installation, but keeps the currently 
 running platform in any case.
 
+C<arch> is a synonym for C<platform>.
+
 Options:
 
 =over 4
@@ -5310,12 +5312,12 @@ written to the terminal.
 
 =back
 
-Note: C<arch> is still accepted as synonym for C<platform>.
 
 =head2 print-platform
 
 Print the TeX Live identifier for the detected platform
 (hardware/operating system) combination to standard output, and exit.
+C<--print-arch> is a synonym.
 
 
 =head2 search [I<option>]... I<what>