[Pgp-tools-commit] r764 - in trunk: caff debian gpg-key2latex gpg-key2ps gpg-mailkeys gpgdir gpglist gpgparticipants gpgsigs keyart keyart/doc keylookup
Guilhem Moulin
guilhem-guest at moszumanska.debian.org
Thu Jan 22 22:48:31 UTC 2015
Author: guilhem-guest
Date: 2015-01-22 22:48:30 +0000 (Thu, 22 Jan 2015)
New Revision: 764
Modified:
trunk/caff/caff
trunk/caff/pgp-clean
trunk/caff/pgp-fixkey
trunk/debian/changelog
trunk/gpg-key2latex/gpg-key2latex
trunk/gpg-key2ps/gpg-key2ps
trunk/gpg-mailkeys/gpg-mailkeys
trunk/gpg-mailkeys/gpg-mailkeys.1
trunk/gpgdir/gpgdir
trunk/gpgdir/gpgdir.1
trunk/gpglist/gpglist
trunk/gpgparticipants/gpgparticipants
trunk/gpgparticipants/gpgparticipants.1
trunk/gpgsigs/gpgsigs
trunk/keyart/doc/keyart.1
trunk/keyart/keyart
trunk/keylookup/keylookup
trunk/keylookup/keylookup.1
Log:
Add the possibility to choose the gpg binary via the "GNUPGBIN" environment variable.
(Default: "gpg".) Also, remind that the working directory for gpg can
be chosen with "GNUPGHOME".
Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/caff/caff 2015-01-22 22:48:30 UTC (rev 764)
@@ -106,6 +106,24 @@
=back
+=head1 ENVIRONMENT
+
+=over
+
+=item I<HOME>
+
+The default home directory.
+
+=item I<GNUPGBIN>
+
+The gpg binary. Default: C<"gpg">.
+
+=item I<GNUPGHOME>
+
+The default working directory for gpg. Default: C<$HOME/.gnupg>.
+
+=back
+
=head1 FILES
=over
@@ -114,7 +132,7 @@
=item $HOME/.caff/keys/yyyy-mm-dd/ - processed keys
-=item $HOME/.caff/gnupghome/ - caff's working dir for gpg
+=item $HOME/.caff/gnupghome/ - caff's working directory for gpg
=item $HOME/.caff/gnupghome/gpg.conf - gpg configuration
@@ -169,7 +187,8 @@
=item B<gpg> [string]
-Path to the GnuPG binary. Default: B<gpg>.
+Path to the GnuPG binary. Default: The value of the I<GNUPGBIN>
+environment variable if set, otherwise C<gpg>.
=item B<gpg-sign> [string]
@@ -452,7 +471,7 @@
$gecos =~ s/,.*//;
my $gpg = GnuPG::Interface->new();
- $gpg->call( 'gpg' );
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init(
'meta_interactive' => 0,
'always_trust' => 1,
@@ -562,7 +581,7 @@
};
@{$CONFIG{'keyid'}} = map { s/^0x//; uc (substr y/ //dr, -16) } @{$CONFIG{'keyid'}};
$CONFIG{'export-sig-age'} //= 24*60*60;
- $CONFIG{'gpg'} //= 'gpg';
+ $CONFIG{'gpg'} //= $ENV{GNUPGBIN} // 'gpg';
$CONFIG{'gpg-sign'} //= $CONFIG{'gpg'};
$CONFIG{'gpg-delsig'} //= $CONFIG{'gpg'};
check_executable($_, $CONFIG{$_}) for qw/gpg gpg-sign gpg-delsig/;
Modified: trunk/caff/pgp-clean
===================================================================
--- trunk/caff/pgp-clean 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/caff/pgp-clean 2015-01-22 22:48:30 UTC (rev 764)
@@ -65,6 +65,24 @@
=back
+=head1 ENVIRONMENT
+
+=over
+
+=item I<HOME>
+
+The default home directory.
+
+=item I<GNUPGBIN>
+
+The gpg binary. Default: C<"gpg">.
+
+=item I<GNUPGHOME>
+
+The default working directory for gpg. Default: C<$HOME/.gnupg>.
+
+=back
+
=head1 FILES
=over
@@ -237,6 +255,7 @@
my ($gnupghome, $keyid) = @_;
my $gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
my %confighash = ( armor => 1 );
$confighash{'homedir'}=$gnupghome if (defined $gnupghome);
$gpg->options->hash_init( %confighash );
@@ -317,6 +336,7 @@
# get key listing
#################
my $gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->meta_interactive( 0 );
my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
$gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
@@ -354,6 +374,7 @@
###############################
my $tempdir = tempdir( "caff-$keyid-XXXXX", DIR => '/tmp/', CLEANUP => 1);
$gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init( 'homedir' => $tempdir );
$gpg->options->meta_interactive( 0 );
($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
@@ -369,6 +390,7 @@
# prune it
##########
$gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init(
'homedir' => $tempdir,
'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
Modified: trunk/caff/pgp-fixkey
===================================================================
--- trunk/caff/pgp-fixkey 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/caff/pgp-fixkey 2015-01-22 22:48:30 UTC (rev 764)
@@ -59,6 +59,24 @@
=back
+=head1 ENVIRONMENT
+
+=over
+
+=item I<HOME>
+
+The default home directory.
+
+=item I<GNUPGBIN>
+
+The gpg binary. Default: C<"gpg">.
+
+=item I<GNUPGHOME>
+
+The default working directory for gpg. Default: C<$HOME/.gnupg>.
+
+=back
+
=head1 FILES
=over
@@ -245,6 +263,7 @@
# find a list of all interesting keys.
if (scalar @KEYIDS == 0) {
my $gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->meta_interactive( 0 );
my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
$gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fast-list-mode', '--fixed-list-mode' ] );
@@ -279,6 +298,7 @@
# get key listing
#################
my $gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->meta_interactive( 0 );
my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
$gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
@@ -311,6 +331,7 @@
# prune it
##########
$gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init(
'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/debian/changelog 2015-01-22 22:48:30 UTC (rev 764)
@@ -13,6 +13,10 @@
the public part of *all* keys found in the secret keyring. (When not
pruning the good keys with -u, gpg(1) croaks with exit status 2 when
there are secret keys without public part.)
+ * caff, pgp-clean, pgp-fixkey, gpg-key2latex, gpg-key2ps, gpg-mailkeys,
+ gpgdir, gpgparticipants, gpgsigs, keyart, keylookup:
+ + Add the possibility to choose the gpg binary via the "GNUPGBIN"
+ environment variable. (Default: "gpg".)
-- Guilhem Moulin <guilhem at guilhem.org> Sat, 03 Jan 2015 11:36:26 +0100
Modified: trunk/gpg-key2latex/gpg-key2latex
===================================================================
--- trunk/gpg-key2latex/gpg-key2latex 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpg-key2latex/gpg-key2latex 2015-01-22 22:48:30 UTC (rev 764)
@@ -51,6 +51,7 @@
# Get the list of all matching keys.
{
my $gpg = GnuPG::Interface::->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init( 'extra_args' => [ qw/--fingerprint
--fixed-list-mode
--no-auto-check-trustdb --with-colons/ ]
@@ -69,6 +70,7 @@
foreach my $keyid (@KEYIDS) {
my $photos = $options{'show-photo'} ? File::Temp::->new(TMPDIR => 1) : '/dev/null';
my $gpg = GnuPG::Interface::->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
# we need --attribute-{fd,file} and --status-{fd,file} to get the
# correct attribute size
$gpg->options->hash_init( 'extra_args' => [ '--attribute-file', $photos,
@@ -175,7 +177,7 @@
push @{$key{uats}}, {size => $2, revoked => $3 & 0x02};
next;
}
- if (!/^\[GNUPG:\] (?:KEYEXPIRED \d+|SIGEXPIRED deprecated-use-keyexpired-instead)$/) {
+ if (!/^\[GNUPG:\] (?:KEYEXPIRED \d+|SIGEXPIRED(?: deprecated-use-keyexpired-instead)?)$/) {
warn "Unknown value: '$_'";
}
}
@@ -480,6 +482,24 @@
=back
+=head1 ENVIRONMENT
+
+=over
+
+=item I<HOME>
+
+The default home directory.
+
+=item I<GNUPGBIN>
+
+The gpg binary. Default: C<"gpg">.
+
+=item I<GNUPGHOME>
+
+The default working directory for gpg. Default: C<$HOME/.gnupg>.
+
+=back
+
=head1 WEBSITE
L<http://pgp-tools.alioth.debian.org/>
Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpg-key2ps/gpg-key2ps 2015-01-22 22:48:30 UTC (rev 764)
@@ -102,7 +102,7 @@
# open a gpg process we'll be reading from below
# --list-key due to #382794
-open GPG, '-|', qw/gpg --list-key --with-fingerprint --with-colons/, @ARGV;
+open GPG, '-|', $ENV{GNUPGBIN} // 'gpg', qw/--list-key --with-fingerprint --with-colons/, @ARGV;
sub start_postscript {
# start the PostScript output
@@ -394,6 +394,24 @@
=back
+=head1 ENVIRONMENT
+
+=over
+
+=item I<HOME>
+
+The default home directory.
+
+=item I<GNUPGBIN>
+
+The gpg binary. Default: C<"gpg">.
+
+=item I<GNUPGHOME>
+
+The default working directory for gpg. Default: C<$HOME/.gnupg>.
+
+=back
+
=head1 SEE ALSO
=over
Modified: trunk/gpg-mailkeys/gpg-mailkeys
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpg-mailkeys/gpg-mailkeys 2015-01-22 22:48:30 UTC (rev 764)
@@ -73,7 +73,7 @@
while [ -n "$1" ]; do
printf "[$1] "
TEMPFILE=`mktemp -t gpg2mail.XXXXXX`
- ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^rei:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' | head -1`
+ ADDR=`${GNUPGBIN:-gpg} --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^rei:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' | head -1`
if [ -z "$ADDR" ]; then
printf "(no usable user ids)\n"
FAILKEYS="$FAILKEYS:$1"
@@ -117,7 +117,7 @@
Content-Type: application/pgp-keys
Content-Disposition: attachment; filename="$1.asc"
-`gpg --armor --export $1`
+`${GNUPGBIN:-gpg} --armor --export $1`
--$BOUNDARY--
EOM
Modified: trunk/gpg-mailkeys/gpg-mailkeys.1
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys.1 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpg-mailkeys/gpg-mailkeys.1 2015-01-22 22:48:30 UTC (rev 764)
@@ -39,6 +39,15 @@
Set arguments to pass to $SENDMAIL. This can be useful to set
credentials in order to authenticate to an smtp server when using ssmtp
for example.
+.TP 13
+.I HOME
+Set the default home directory.
+.TP 13
+.I GNUPGBIN
+Set the gpg binary. Default: "gpg".
+.TP 13
+.I GNUPGHOME
+Set the default working directory for gpg. Default: "~/.gnupg".
.SH FILES
The behavior of
Modified: trunk/gpgdir/gpgdir
===================================================================
--- trunk/gpgdir/gpgdir 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpgdir/gpgdir 2015-01-22 22:48:30 UTC (rev 764)
@@ -411,6 +411,7 @@
my ($in_file, $out_file, $del_flag) = @_;
my $gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init(%options);
die "[*] Could not create new gpg object with ",
@@ -513,6 +514,7 @@
my $handles = '';
my $gpg = GnuPG::Interface->new();
+ $gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
$gpg->options->hash_init(%options);
die "[*] Could not create new gpg object with ",
Modified: trunk/gpgdir/gpgdir.1
===================================================================
--- trunk/gpgdir/gpgdir.1 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpgdir/gpgdir.1 2015-01-22 22:48:30 UTC (rev 764)
@@ -235,6 +235,16 @@
or decrypt the files within a directory.
.RE
.PP
+.SH ENVIRONMENT
+.TP 13
+.I HOME
+Set the default home directory.
+.TP 13
+.I GNUPGBIN
+Set the gpg binary. Default: "gpg".
+.TP 13
+.I GNUPGHOME
+Set the default working directory for gpg. Default: "~/.gnupg".
.SH EXAMPLES
The following examples illustrate the command line arguments that could
be supplied to gpgdir in a few situations:
Modified: trunk/gpglist/gpglist
===================================================================
--- trunk/gpglist/gpglist 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpglist/gpglist 2015-01-22 22:48:30 UTC (rev 764)
@@ -86,7 +86,7 @@
die "Usage: $PROGRAM_NAME <keyid>\n";
}
-open SIGS, '-|', qw/gpg --no-auto-check-trustdb --list-options show-sig-subpackets --fixed-list-mode --with-colons --list-sigs/, $key
+open SIGS, '-|', $ENV{GNUPGBIN} // 'gpg', qw/--no-auto-check-trustdb --list-options show-sig-subpackets --fixed-list-mode --with-colons --list-sigs/, $key
or die "can't get gpg listing";
my ($uid, $id) = ('', '');
Modified: trunk/gpgparticipants/gpgparticipants
===================================================================
--- trunk/gpgparticipants/gpgparticipants 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpgparticipants/gpgparticipants 2015-01-22 22:48:30 UTC (rev 764)
@@ -52,7 +52,7 @@
algos=$(echo "$algos" | tr ',' ' ')
for algo in $algos; do
# Ensure this is a valid algo
- gpg --print-md "$algo" /dev/null >/dev/null || exit $?
+ ${GNUPGBIN:-gpg} --print-md "$algo" /dev/null >/dev/null || exit $?
done
input="$1"
@@ -83,7 +83,7 @@
EOF
for algo in $algos; do
- printf " gpg --print-md %s %s\n" "$algo" "$output"
+ printf " ${GNUPGBIN:-gpg} --print-md %s %s\n" "$algo" "$output"
done
cat <<EOF
@@ -149,7 +149,7 @@
while read i; do
k=$(($k+1));
printf "\n%03d [ ] Fingerprint OK [ ] ID OK\n" $k;
- LANGUAGE=en gpg $options --display-charset utf-8 --fingerprint --list-keys -- $i \
+ LANGUAGE=en ${GNUPGBIN:-gpg} $options --display-charset utf-8 --fingerprint --list-keys -- $i \
| grep -ve "^sub" -e '^uid *\[jpeg image of size ';
echo "_______________________________________________________________________________"
done
Modified: trunk/gpgparticipants/gpgparticipants.1
===================================================================
--- trunk/gpgparticipants/gpgparticipants.1 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpgparticipants/gpgparticipants.1 2015-01-22 22:48:30 UTC (rev 764)
@@ -29,6 +29,17 @@
value (to be filled by the participants) to the output file. Default:
SHA256,RIPEMD160.
+.SH ENVIRONMENT
+.TP 13
+.I HOME
+Set the default home directory.
+.TP 13
+.I GNUPGBIN
+Set the gpg binary. Default: "gpg".
+.TP 13
+.I GNUPGHOME
+Set the default working directory for gpg. Default: "~/.gnupg".
+
.SH EXAMPLES
To create a KSP file with all keys present in the keyring:
Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/gpgsigs/gpgsigs 2015-01-22 22:48:30 UTC (rev 764)
@@ -119,7 +119,7 @@
# get all known signatures
if ($recv_keys) {
print STDERR "Requesting keys from keyserver\n";
- system qw/gpg --recv-keys/, @keys;
+ system $ENV{GNUPGBIN} // 'gpg', '--recv-keys', @keys;
}
my $now = time;
@@ -127,7 +127,7 @@
my $photos = $latex ? File::Temp::->new(TMPDIR => 1) : '/dev/null';
my $gpg = GnuPG::Interface::->new();
-$gpg->call( 'gpg' );
+$gpg->call( $ENV{GNUPGBIN} ) if defined $ENV{GNUPGBIN};
# we need --attribute-{fd,file} and --status-{fd,file} to get the
# correct attribute size
$gpg->options->hash_init( 'extra_args' => [ '--attribute-file', $photos,
@@ -246,7 +246,7 @@
push @photos, {key => $1, size => $2, revoked => $3 & 0x02};
next;
}
- if (!/^\[GNUPG:\] (?:KEYEXPIRED \d+|SIGEXPIRED deprecated-use-keyexpired-instead)$/) {
+ if (!/^\[GNUPG:\] (?:KEYEXPIRED \d+|SIGEXPIRED(?: deprecated-use-keyexpired-instead)?)$/) {
warn "Unknown value: '$_'";
}
}
@@ -330,7 +330,7 @@
sub getChecksum ($$) {
my ($algo, $infile) = @_;
- open MD, '-|', qw/gpg --with-colons --print-md/, $algo, $infile or warn "Can't get gpg $algo digest\n";
+ open MD, '-|', $ENV{GNUPGBIN} // 'gpg', qw/--with-colons --print-md/, $algo, $infile or warn "Can't get gpg $algo digest\n";
my $digest = <MD>;
close MD;
return $1 if $digest and $digest =~ /:([0-9A-F]+):[^:]*$/;
@@ -557,6 +557,24 @@
=back
+=head1 ENVIRONMENT
+
+=over
+
+=item I<HOME>
+
+The default home directory.
+
+=item I<GNUPGBIN>
+
+The gpg binary. Default: C<"gpg">.
+
+=item I<GNUPGHOME>
+
+The default working directory for gpg. Default: C<$HOME/.gnupg>.
+
+=back
+
=head1 EXAMPLES
The following key signing parties are using B<gpgsigs>:
Modified: trunk/keyart/doc/keyart.1
===================================================================
--- trunk/keyart/doc/keyart.1 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/keyart/doc/keyart.1 2015-01-22 22:48:30 UTC (rev 764)
@@ -53,6 +53,18 @@
.TP 8
.B \-h | \-\-help
Print the help message and quit.
+
+.SH ENVIRONMENT
+.TP 8
+.I HOME
+Set the default home directory.
+.TP 8
+.I GNUPGBIN
+Set the gpg binary. Default: "gpg".
+.TP 8
+.I GNUPGHOME
+Set the default working directory for gpg. Default: "~/.gnupg".
+
.SH EXIT STATUS
.TP 8
.B 0
Modified: trunk/keyart/keyart
===================================================================
--- trunk/keyart/keyart 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/keyart/keyart 2015-01-22 22:48:30 UTC (rev 764)
@@ -25,18 +25,6 @@
help='A key identifier (email, ID, fingerprint, etc.).')
ARGS = PARSER.parse_args()
-def test_env():
- """Test if and where GPG is installed."""
- try:
- if os.access('/usr/bin/gpg', os.X_OK):
- gnupg = '/usr/bin/gpg'
- else:
- gnupg = '/usr/bin/gpg2'
- return gnupg
- except OSError:
- print("Please install GnuPG before using this script.")
- sys.exit(1)
-
def draw_art(key_size, key_algo, key_fpr):
"""Execute the Drunken Bishop algorithm on a key."""
art = ''
@@ -251,7 +239,7 @@
algo = None
if __name__ == '__main__':
- gpg_bin = test_env()
+ gpg_bin = os.getenv('GNUPGBIN', 'gpg')
strip_nonhex = re.compile('[^a-fA-F0-9]+')
cmd = [gpg_bin, '--no-options', '--with-colons', '--fingerprint']
Modified: trunk/keylookup/keylookup
===================================================================
--- trunk/keylookup/keylookup 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/keylookup/keylookup 2015-01-22 22:48:30 UTC (rev 764)
@@ -80,7 +80,7 @@
open (STDIN, "/dev/null") || die ("Cannot open /dev/null as stdin: $!\n");
# child
- my @ops = ('gpg');
+ my @ops = ($ENV{GNUPGBIN} // 'gpg');
if ($options->{'keyserver'}) {
push @ops, '--keyserver='.$options->{'keyserver'};
};
@@ -289,7 +289,7 @@
my $keyids = shift;
my $options = shift;
- my @args = ('gpg');
+ my @args = ($ENV{GNUPGBIN} // 'gpg');
if ($options->{'keyserver'}) {
push @args, '--keyserver='.$options->{'keyserver'};
};
Modified: trunk/keylookup/keylookup.1
===================================================================
--- trunk/keylookup/keylookup.1 2015-01-22 10:52:35 UTC (rev 763)
+++ trunk/keylookup/keylookup.1 2015-01-22 22:48:30 UTC (rev 764)
@@ -62,6 +62,9 @@
.IP "GNUPGHOME" 10
If set directory used instead of "~/.gnupg".
+.IP "GNUPGBIN" 10
+If set used as gpg binary instead of "gpg".
+
.IP "http_proxy" 10
Only honored when the option \-\-honor\-http\-proxy is set or
honor\-http\-proxy is set in GnuPG's config file.
More information about the Pgp-tools-commit
mailing list