projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up keyid detection
[pgp-tools.git]
/
gpg-key2ps
/
gpg-key2ps
diff --git
a/gpg-key2ps/gpg-key2ps
b/gpg-key2ps/gpg-key2ps
index e18dbc22dad2c09d254dddf0fadd13bd6992facb..302381b73e6b758ae2a06a517e43c9ac78147215 100755
(executable)
--- a/
gpg-key2ps/gpg-key2ps
+++ b/
gpg-key2ps/gpg-key2ps
@@
-2,8
+2,8
@@
#
# gpg-key2ps: convert a PGP/GnuPG key into paper slips.
# Copyright (C) 2001-2005 Simon Richter
#
# gpg-key2ps: convert a PGP/GnuPG key into paper slips.
# Copyright (C) 2001-2005 Simon Richter
-# Copyright (C) 2005 Thijs Kinkhorst
-# Copyright (C) 2005 Christoph Berg <cb@df7cb.de>
+# Copyright (C) 2005
-2006
Thijs Kinkhorst
+# Copyright (C) 2005
-2006
Christoph Berg <cb@df7cb.de>
# Licenced under the GNU General Public License,
# version 2 or later.
#
# Licenced under the GNU General Public License,
# version 2 or later.
#
@@
-19,7
+19,7
@@
my $creationdate = scalar(localtime);
sub version($) {
my $fd = shift;
sub version($) {
my $fd = shift;
- print $fd "gpg-key2ps $version - (c) 2001-200
5
Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
+ print $fd "gpg-key2ps $version - (c) 2001-200
6
Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
}
sub usage($$) {
}
sub usage($$) {
@@
-78,7
+78,7
@@
usage(\*STDERR, 1) unless scalar @ARGV >= 1;
# determine the paper size through the paperconf tool
my $w; my $h;
# determine the paper size through the paperconf tool
my $w; my $h;
-if (
-x "/usr/bin/paperconf"
) {
+if (
`which paperconf` && $? == 0
) {
$w=`paperconf -w`;
$h=`paperconf -h`;
chomp($w);
$w=`paperconf -w`;
$h=`paperconf -h`;
chomp($w);
@@
-92,7
+92,8
@@
if ( -x "/usr/bin/paperconf" ) {
# open a gpg process we'll be reading from below
map { s/'/'\\''/g; } @ARGV; # quote single quotes
# open a gpg process we'll be reading from below
map { s/'/'\\''/g; } @ARGV; # quote single quotes
-open(GPG, "gpg --fingerprint --with-colons '". (join "' '", @ARGV) ."' |");
+# --list-key due to #382794
+open(GPG, "gpg --list-key --with-fingerprint --with-colons '". (join "' '", @ARGV) ."' |");
sub start_postscript {
# start the PostScript output
sub start_postscript {
# start the PostScript output