From a262ae002eacb541230398abf0b4f35459640b71 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 May 2016 21:31:52 +0000 Subject: context (11may16) git-svn-id: svn://tug.org/texlive/trunk@41045 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 62 +++++++++------------- 1 file changed, 26 insertions(+), 36 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 64f9aedc1f7..1bd49fb0855 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 40915 2016-05-06 10:04:53Z preining $ +# $Id: tlmgr.pl 40982 2016-05-09 22:33:36Z karl $ # # Copyright 2008-2016 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 40915 $'; -my $datrev = '$Date: 2016-05-06 12:04:53 +0200 (Fri, 06 May 2016) $'; +my $svnrev = '$Revision: 40982 $'; +my $datrev = '$Date: 2016-05-10 00:33:36 +0200 (Tue, 10 May 2016) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -2453,7 +2453,7 @@ sub action_update { # we require: # if no --list is given: either --self or --all or # if --list is given: nothing - # other options just change the behaviour + # other options just change the behavior if (!($opts{"list"} || @ARGV || $opts{"all"} || $opts{"self"})) { tlwarn("$prg update: specify --list, --all, --self, or a list of package names.\n"); return ($F_ERROR); @@ -5624,22 +5624,20 @@ sub texconfig_conf_mimic { # # tlmgr key list # tlmgr key add -# tlmgr key delete +# tlmgr key remove sub action_key { my $arg = shift @ARGV; - - if (!defined($arg)) { tlwarn("missing arguments to action `key'\n"); return $F_ERROR; } $arg = lc($arg); - if ($arg =~ /^(add|delete|list)$/) { + if ($arg =~ /^(add|remove|list)$/) { handle_gpg_config_settings(); if (!$::gpg) { - tlwarn("gnupg is not found or setup, cannot continue with action `key'\n"); + tlwarn("gnupg is not found or not set up, cannot continue with action `key'\n"); return $F_ERROR; } chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); @@ -5648,15 +5646,15 @@ sub action_key { debug("running $::gpg --list-keys\n"); system("$::gpg --list-keys"); return $F_OK; - } elsif ($arg eq 'delete') { + } elsif ($arg eq 'remove') { my $what = shift @ARGV; if (!$what) { - tlwarn("missing argument to `key add'\n"); + tlwarn("missing argument to `key remove'\n"); return $F_ERROR; } - # we need to make sure that $local_keyring is existent! + # we need to make sure that $local_keyring exists. if (! -r $local_keyring) { - tlwarn("no local keyring available, cannot delete anything!\n"); + tlwarn("no local keyring available, cannot remove!\n"); return $F_ERROR; } debug("running: $::gpg --primary-keyring repository-keys.gpg --delete-key $what\n"); @@ -7116,28 +7114,20 @@ C<--reinstall>, as in (using the C package as the example): =back -=head2 key I - -=over 4 - -=item B - -=item B> - -=item B> +=head2 key list|add I|remove I -The action C allows listing, adding and removing additional keys -to the set of trusted keys, that is those that are used to verify the -TeX Live databases. +The action C allows listing, adding and removing additional GPG +keys to the set of trusted keys, that is, those that are used to verify +the TeX Live databases. -With the C argument lists all keys. +With the C argument, C lists all keys. The C argument requires another argument, either a filename or C<-> for stdin, from which the key is added. The key is added to the -local keyring C, which normally is +local keyring C, which is normally) C. -The C argument requires a key id and removes the requested id +The C argument requires a key id and removes the requested id from the local keyring. =head2 option @@ -7228,7 +7218,7 @@ The C, C, and C options are used on Unix-like systems to control the generation of links for executables, info files and man pages. See the C action for details. -The last three options control behaviour on Windows installations. If +The last three options control behavior on Windows installations. If C is set, then some packages will install items in a sub-folder of the Start menu for C, documentation, etc. If C is set, Windows file associations are made (see also the @@ -7834,14 +7824,14 @@ our context.) C also avoids the warning. =head1 CRYPTOGRAPHIC VERIFICATION -If a working GnuPG binary (C) is found (see below for the search +If a working GnuPG binary (C) is found (see below for search method), by default verification of downloaded files is performed. This can be suppressed by specifying C<--no-verify-downloads> on the command -line, or adding an entry C to a tlmgr config file -(described in L). On the other hand, -it is possible to B verification by either specifying -C<--require-verification> on the command line, or adding an entry -C to a tlmgr config file. +line, or adding an entry C to a C config +file (described in L). On the other hand, +it is possible to I verification by specifying +C<--require-verification> on the command line, or by adding an entry +C to a C config file. Verification is performed as follows: For each C loaded for a repository, the respective checksum C is @@ -7865,7 +7855,7 @@ variable C is set, it is tested and used; otherwise C is checked; finally C is checked. Further adaptation of the C invocation can be made using the two -enviroment variables C, which is passed to C as the +environment variables C, which is passed to C as the value for C<--homedir>, and C, which replaces the default arguments C<--no-secmem-warning --no-permission-warning>. -- cgit v1.2.3