Updated caff's manpage according to #482693

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 8ebf8662479caa466944ae55b58023626e672fa2..8cc36d7d841af4b28855fcd841ed999bed19bd46 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -82,7 +82,9 @@ Do not sign the keys.
 =item B<-u> I<yourkeyid>, B<--local-user> I<yourkeyid>
 
 Select the key that is used for signing, in case you have more than one key.
 =item B<-u> I<yourkeyid>, B<--local-user> I<yourkeyid>
 
 Select the key that is used for signing, in case you have more than one key.

-To sign with multiple keys at once, separate multiple keyids by comma.
+To sign with multiple keys at once, separate multiple keyids by comma. This
+option requires the key(s) to be defined through the keyid variable in the
+configuration file.

 
 =item B<--key-file> I<file>
 
 
 =item B<--key-file> I<file>
 


@@ -135,14 +137,22 @@ A list of your keys.  This is used to determine which signatures to keep
 in the pruning step.  If you select a key using B<-u> it has to be in
 this list.  B<REQUIRED>.
 
 in the pruning step.  If you select a key using B<-u> it has to be in
 this list.  B<REQUIRED>.
 

+=back
+

 =head2 General settings
 
 =head2 General settings
 

+=over
+

 =item B<caffhome> [string]
 
 Base directory for the files caff stores.  Default: B<$HOME/.caff/>.
 
 =item B<caffhome> [string]
 
 Base directory for the files caff stores.  Default: B<$HOME/.caff/>.
 

+=back
+

 =head2 GnuPG settings
 
 =head2 GnuPG settings
 

+=over
+

 =item B<gpg> [string]
 
 Path to the GnuPG binary.  Default: B<gpg>.
 =item B<gpg> [string]
 
 Path to the GnuPG binary.  Default: B<gpg>.


@@ -171,8 +181,12 @@ Additional keyids to encrypt messages to. Default: none.
 Additional commands to pass to gpg after the "sign" command.
 Default: none.
 
 Additional commands to pass to gpg after the "sign" command.
 Default: none.
 

+=back
+

 =head2 Keyserver settings
 
 =head2 Keyserver settings
 

+=over
+

 =item B<keyserver> [string]
 
 Keyserver to download keys from.  Default: B<subkeys.pgp.net>.
 =item B<keyserver> [string]
 
 Keyserver to download keys from.  Default: B<subkeys.pgp.net>.


@@ -186,8 +200,12 @@ Default: B<0>.
 
 A list of files containing keys to be imported.
 
 
 A list of files containing keys to be imported.
 

+=back
+

 =head2 Signing settings
 
 =head2 Signing settings
 

+=over
+

 =item B<no-sign> [boolean]
 
 If true, then skip the signing step. Default: B<0>.
 =item B<no-sign> [boolean]
 
 If true, then skip the signing step. Default: B<0>.


@@ -207,8 +225,12 @@ than this age.  Default: B<24*60*60> (i.e. one day).
 Select the key that is used for signing, in case you have more than one key.
 With multiple keyids, sign with each key in turn.
 
 Select the key that is used for signing, in case you have more than one key.
 With multiple keyids, sign with each key in turn.
 

+=back
+

 =head2 Mail settings
 
 =head2 Mail settings
 

+=over
+

 =item B<mail> [boolean]
 
 Whether to send mails. This is a quad-option, with which you can set the
 =item B<mail> [boolean]
 
 Whether to send mails. This is a quad-option, with which you can set the


@@ -913,19 +935,18 @@ $CONFIG{'local-user'}  = $params->{'local-user'}  if defined $params->{'local-us
 $CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
 $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'};
 
 $CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
 $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'};
 

+$CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined $params->{'no-mail'};
+$CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
+

 # If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no'
 # If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no'

-if ( $CONFIG{'no-mail'} || defined $params->{'no-mail'} ||
-       ( defined $params->{'mail'} && $params->{'mail'}  eq 'no' ) ) {
+if ( defined $CONFIG{'no-mail'} || 
+     ( defined $CONFIG{'mail'} && $CONFIG{'mail'}  eq 'no' ) ) {

        $CONFIG{'mail'} = 'no';
        $CONFIG{'mail'} = 'no';

-} elsif ( defined $params->{'mail'} ) {
-       $CONFIG{'mail'} = $params->{'mail'};
-} else {
+
+} elsif ( !defined $CONFIG{'mail'} ) {

        $CONFIG{'mail'} = 'ask-yes';
 }
 
        $CONFIG{'mail'} = 'ask-yes';
 }
 

-$CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined $params->{'no-mail'};
-$CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
-

 push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
 
 for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument
 push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
 
 for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument