projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ Make also-encrypt-to a list, add a commented stanza to the default
[pgp-tools.git]
/
keylookup
/
keylookup
diff --git
a/keylookup/keylookup
b/keylookup/keylookup
index 4c3ccefbfe4318647162758510c36e3ed2d486e0..e069289f670f75d6dce5d04783b11cc786331ff3 100755
(executable)
--- a/
keylookup/keylookup
+++ b/
keylookup/keylookup
@@
-1,7
+1,7
@@
#!/usr/bin/perl -w
#!/usr/bin/perl -w
-# (c) 2000, 2002 Christian Kurz <shorty@debian.org>,
-#
Peter Palfrader <peter@palfrader.org>
+#
Copyright
(c) 2000, 2002 Christian Kurz <shorty@debian.org>,
+#
Copyright (c) 2000, 2002, 2005
Peter Palfrader <peter@palfrader.org>
#
# $Id$
#
#
# $Id$
#
@@
-17,12
+17,14
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#
#
-# Keylookup homepage: http://www.palfrader.org/keylookup/
-# CVS, BTS: http://savannah.gnu.org/projects/keylookup/
+# Keylookup is part of pgp-tools:
+# http://pgp-tools.alioth.debian.org/
+# svn://svn.debian.org/pgp-tools/trunk/
+# http://svn.debian.org/wsvn/pgp-tools/trunk/
-delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'
, 'PATH'
};
+delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
$|=1; # Always flush buffers
$|=1; # Always flush buffers
@@
-33,11
+35,6
@@
use Getopt::Long;
my $version = '3.0 ($Id$)';
my $version = '3.0 ($Id$)';
-# Where to find GnuPG's options file.
-# Full path to the dialog and whiptail executeable.
-my $Dialog = '/usr/bin/dialog';
-my $Whiptail = '/usr/bin/whiptail';
-
# Strings to use in the dialog|whiptail frontend
my $TITLE = 'Import Keys';
my $BACKTITLE = 'KeyLookup $Revision$';
# Strings to use in the dialog|whiptail frontend
my $TITLE = 'Import Keys';
my $BACKTITLE = 'KeyLookup $Revision$';
@@
-93,7
+90,7
@@
sub getHits($) {
push @ops, '--with-colons';
push @ops, '--fixed-list-mode';
push @ops, '--search';
push @ops, '--with-colons';
push @ops, '--fixed-list-mode';
push @ops, '--search';
- push @ops,
$options->{'search'
};
+ push @ops,
@{$options->{'search'}
};
exec(@ops);
die ("Cannot exec GnuPG: $!\n");
};
exec(@ops);
die ("Cannot exec GnuPG: $!\n");
};
@@
-230,14
+227,14
@@
sub selectKeys {
$frontend = 'dialog' unless (defined $frontend);
if ($frontend eq 'dialog') {
$frontend = 'dialog' unless (defined $frontend);
if ($frontend eq 'dialog') {
- unless (
-x $Dialog
) {
- warn("Dialog
($Dialog)
not executeable/installed. Falling back to Whiptail\n");
+ unless (
`which dialog` && $? == 0
) {
+ warn("Dialog not executeable/installed. Falling back to Whiptail\n");
$frontend = 'whiptail';
}
};
if ($frontend eq 'whiptail') {
$frontend = 'whiptail';
}
};
if ($frontend eq 'whiptail') {
- unless (
-x $Whiptail
) {
- warn("Whiptail
($Whiptail)
not executeable/installed. Falling back to plain\n");
+ unless (
`which whiptail` && $? == 0
) {
+ warn("Whiptail not executeable/installed. Falling back to plain\n");
$frontend = 'plain';
}
};
$frontend = 'plain';
}
};
@@
-245,7
+242,7
@@
sub selectKeys {
if ( $frontend eq 'dialog' ) {
calcDialogSize;
my @ARGS = (
if ( $frontend eq 'dialog' ) {
calcDialogSize;
my @ARGS = (
-
$Dialog
,
+
'dialog'
,
'--backtitle',
$BACKTITLE,
'--separate-output',
'--backtitle',
$BACKTITLE,
'--separate-output',
@@
-259,7
+256,7
@@
sub selectKeys {
} elsif ( $frontend eq 'whiptail' ) {
calcDialogSize;
my @ARGS = (
} elsif ( $frontend eq 'whiptail' ) {
calcDialogSize;
my @ARGS = (
-
$Whiptail
,
+
'whiptail'
,
'--backtitle',
$BACKTITLE,
'--separate-output',
'--backtitle',
$BACKTITLE,
'--separate-output',
@@
-343,13
+340,14
@@
sub version {
## Take all additional arguments to the program as a search target,
## escape the string for use in URLs.
## Take all additional arguments to the program as a search target,
## escape the string for use in URLs.
- $options{'search'} = join ' ', @ARGV;
- $options{'search'} =~ s/ ( [^A-Za-z0-9] )
- / '%' . unpack("H2", $1)
- /xeg;
+ $options{'search'} = \@ARGV;
my $keys = getHits( \%options );
my $keyids;
my $keys = getHits( \%options );
my $keyids;
+ if (scalar keys %$keys == 0) {
+ print "GnuPG did not find any keys matching your search string.\n";
+ exit 0;
+ };
if ($options{'importall'}) {
my @allkeys = keys %$keys;
$keyids = \@allkeys;
if ($options{'importall'}) {
my @allkeys = keys %$keys;
$keyids = \@allkeys;