diff options
author | Norbert Preining <preining@logic.at> | 2009-08-26 11:51:41 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-08-26 11:51:41 +0000 |
commit | 3a7b4e71fab6a3e7a48dfdd71b8bdf9d464e5201 (patch) | |
tree | ba7c446be3416db3569c80f2f1f43b0b6a57c6fe | |
parent | ad324bd0d49f2dea3fa7f7a20dc64f22770a07b9 (diff) |
use tlmgr option repository, but also accept option location to
keep backward compatibility
git-svn-id: svn://tug.org/texlive/trunk@14865 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 22 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 3 |
2 files changed, 17 insertions, 8 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index da4c9700baf..26a36b8a1a3 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -2287,6 +2287,10 @@ sub action_option { (defined($loc{$o}) ? $loc{$o} : "(not set)") . "\n"); } } else { + if ($what eq "location") { + # rewrite location -> repository + $what = "repository"; + } my $found = 0; for my $opt (keys %TLPDBOptions) { if ($what eq $TLPDBOptions{$opt}->[2]) { @@ -3754,15 +3758,16 @@ name and its value. =over 4 -=item B<--repo[sitory]> I<url|path> - -=item B<--location> I<url|path> +=item B<--repository> I<url|path> Specifies the package repository from which packages should be installed or updated, overriding the default package repository found in the installation's TeX Live Package Database (TLPDB). The documentation for C<install-tl> has more details about this. +For convenience and backward compatibility both C<--location> and +C<--repo> are accepted as aliases for this option. + =item B<--gui> [I<action>] You can give this option together with an action to be brought directly @@ -4149,7 +4154,7 @@ displayed. If I<value> is present, I<key> is set to I<value>. Possible values for I<key> are (but see B<tlmgr option showall> for the definitive list): - location (default package repository), + repository (default package repository), formats (create formats at installation time), docfiles (install documentation files), srcfiles (install source files), @@ -4163,10 +4168,13 @@ One common use of C<option> is to permanently change the installation to get further updates from the Internet, after originally installing from DVD. To do this, you can run - tlmgr option location http://mirror.ctan.org/systems/texlive/tlnet + tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet + +The C<install-tl> documentation has more information about the possible +values for repository. -The C<install-tl> documentation has more information about these -locations. +To keep backward compatibility C<location> can be used as alternative +name for C<repository>. The two options C<autobackup> and C<backupdir> determine defaults for the C<update>, C<backup> and C<restore> actions. These three actions diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index e90c000629e..c6fd878c66d 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -122,10 +122,11 @@ our %TLPDBConfigs = ( # ->[1] --> default value # ->[2] --> tlmgr name # ->[3] --> tlmgr description +# the "option" is the value in the TLPDB our %TLPDBOptions = ( "location" => - [ "u", "__MASTER__", "location", + [ "u", "__MASTER__", "repository", "Default package repository" ], "create_formats" => [ "b", 1, "formats", |