[Pgp-tools-commit] r807 - trunk/caff

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-04-20 08:33:26 +0000 (Mon, 20 Apr 2015)
New Revision: 807

Modified:
   trunk/caff/caff
Log:
caff: use $CONFIG{gpg} not 'gpg' in the generated caffrc.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-04-20 08:33:20 UTC (rev 806)
+++ trunk/caff/caff	2015-04-20 08:33:26 UTC (rev 807)
@@ -571,13 +571,13 @@
         $handles->{stdout}->close;
 
         if ($output{stdout} eq '') {
-            mywarn "No data from gpg for list-key"; # There should be at least 'tru:' everywhere.
+            mywarn "No data from $CONFIG{gpg} for list-key"; # There should be at least 'tru:' everywhere.
         };
 
         @keys = ($output{stdout} =~ /^pub:[^eir:]*:(?:[^:]*:){2}([0-9A-F]{16}):/mg);
         unless (scalar @keys) {
-            notice("Error: No keys were found using \"gpg --list-public-keys '$gecos'\"", 0);
-            @keys = qw{0123456789abcdef 89abcdef76543210};
+            notice("Error: No keys were found using \"$CONFIG{gpg} --list-public-keys '$gecos'\"", 0);
+            @keys = qw{0123456789ABCDEF 89ABCDEF76543210};
             $Ckeys = '#';
         }
         my @emails = ($output{stdout} =~ /^uid:[^eir:]*:(?:[^:]*:){7}([^:]+)(?::.*)?$/mg);
@@ -587,14 +587,14 @@
             $email = shift @emails; # take the first valid address
         }
         unless (defined $email) {
-            notice("Error: No email address was found using \"gpg --list-public-keys '$gecos'\"", 0);
+            notice("Error: No email address was found using \"$CONFIG{gpg} --list-public-keys '$gecos'\"", 0);
             $email = $ENV{'LOGNAME'}.'@'.$hostname;
             $Cemail = '#';
         }
     } else {
         $gecos = 'Unknown Caff User';
         $email = $ENV{'LOGNAME'}.'@'.$hostname;
-        @keys = qw{0123456789abcdef 89abcdef76543210};
+        @keys = qw{0123456789ABCDEF 89ABCDEF76543210};
         ($Cgecos,$Cemail,$Ckeys) = ('#','#','#');
     };
 
@@ -607,7 +607,7 @@
 #\$CONFIG{'reply-to'} = 'foo\@bla.org';
 
 # You can get your long keyid from
-#   gpg --keyid-format long --list-key <yourkeyid|name|emailaddress..>
+#   $CONFIG{gpg} --keyid-format long --list-key <yourkeyid|name|emailaddress..>
 #
 # If you have a v4 key, it will simply be the last 16 digits of
 # your fingerprint.