X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=cb25412c75d54e2dd68faf4174ae8a58d79b77a6;hb=a74ec3cd73bf9bde72e28d0663b6daf8a54e649f;hp=799485865463966fa9e61c6690137b26c769dfdd;hpb=80ccb89f323019db6df812f4871f601de3f118cf;p=pgp-tools.git diff --git a/caff/caff b/caff/caff index 7994858..cb25412 100755 --- a/caff/caff +++ b/caff/caff @@ -465,7 +465,8 @@ sub load_config() { check_executable("gpg", $CONFIG{'gpg'}); check_executable("gpg-sign", $CONFIG{'gpg-sign'}); check_executable("gpg-delsig", $CONFIG{'gpg-delsig'}); - $CONFIG{'secret-keyring'} = $ENV{'HOME'}.'/.gnupg/secring.gpg' unless defined $CONFIG{'secret-keyring'}; + $CONFIG{'secret-keyring'} = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/secring.gpg' + unless defined $CONFIG{'secret-keyring'}; $CONFIG{'no-download'} = 0 unless defined $CONFIG{'no-download'}; $CONFIG{'no-sign'} = 0 unless defined $CONFIG{'no-sign'}; $CONFIG{'key-files'} = () unless defined $CONFIG{'key-files'};