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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-02-17 21:42:23 +0000 (Wed, 17 Feb 2016)
New Revision: 834

Modified:
   trunk/caff/caff
Log:
caff: replace "||" with "//".

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-02-17 21:42:18 UTC (rev 833)
+++ trunk/caff/caff	2016-02-17 21:42:23 UTC (rev 834)
@@ -678,7 +678,7 @@
     $CONFIG{'gpg'} //= $ENV{GNUPGBIN} // 'gpg';
     mywarn("Deprecated option \$CONFIG{'$_'} = '$CONFIG{$_}'") for grep {defined $CONFIG{$_}} qw/gpg-sign gpg-delsig keyserver/;
 
-    $CONFIG{'secret-keyring'} //= ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/secring.gpg';
+    $CONFIG{'secret-keyring'} //= ($ENV{'GNUPGHOME'} // "$ENV{'HOME'}/.gnupg") . '/secring.gpg';
     $CONFIG{'no-download'} //= 0;
     $CONFIG{'no-sign'} //= 0;
     $CONFIG{'key-files'} //= [];
@@ -1457,7 +1457,7 @@
     }
     unless ($CONFIG{'no-download'}) {
         # Ensure we have a working agent for the downloads
-        my $homedir = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg");
+        my $homedir = $ENV{'GNUPGHOME'} // "$ENV{'HOME'}/.gnupg";
         mysystem('gpg-connect-agent', '--homedir', $homedir, '--dirmngr', '/bye');
         push @sockets, "$homedir/S.dirmngr";
     }