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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-12 19:34:37 +0000 (Tue, 12 Jul 2016)
New Revision: 868

Modified:
   trunk/caff/caff
Log:
caff: replace '$HOME/' with '~/' in notice messages.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-12 19:34:34 UTC (rev 867)
+++ trunk/caff/caff	2016-07-12 19:34:37 UTC (rev 868)
@@ -667,9 +667,10 @@
 sub load_config() {
     my $config = $ENV{'HOME'} . '/.caffrc';
     unless (-f $config) {
-        print "No configfile $config present, I will use this template:\n";
+        notice "No configfile $config present, I will use this template:";
         my $template = generate_config();
-        print "$template\nPlease edit $config and run caff again.\n";
+        print $template, "\n";
+        notice "Please edit $config and run caff again.";
         open F, '>', $config or myerror(1, "$config: $!");
         print F $template;
         close F;
@@ -777,7 +778,7 @@
         /;
 
         push @GNUPGOPTS, '--no-options';
-        notice("Importing GnuPG options from $gpgconf:");
+        notice('Importing GnuPG options from '.($ENV{'GNUPGHOME'} // '~/.gnupg').'/gpg.conf:');
         while (<$fh>) {
             s/(?:\r\n|\r|\n)\z// or next;
             if (/\A\s*([0-9a-zA-Z\-]+)\z/ and grep { $_ eq $1 } @gnupgopts_n) {
@@ -1355,7 +1356,7 @@
     my $status = { map { $_ => [] } @$keyids };
 
     if ($CONFIG{'keys-from-gnupg'}) {
-        notice("Importing keys from your normal GnuPGHOME (".($ENV{'GNUPGHOME'} // "$ENV{'HOME'}/.gnupg").")");
+        notice("Importing keys from your normal GnuPGHOME (".($ENV{'GNUPGHOME'} // "~/.gnupg").")");
         merge_import_status( $status, import_keys_from_gnupghome($keyids, undef, $GNUPGHOME, 0) );
     }