projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpg-key2ps, keylookup: make them less dependent on specific
[pgp-tools.git]
/
keylookup
/
keylookup
diff --git
a/keylookup/keylookup
b/keylookup/keylookup
index bdf508702cbdfe208d9ebcc8096f1a01b1d2a9f4..e069289f670f75d6dce5d04783b11cc786331ff3 100755
(executable)
--- a/
keylookup/keylookup
+++ b/
keylookup/keylookup
@@
-24,7
+24,7
@@
# svn://svn.debian.org/pgp-tools/trunk/
# http://svn.debian.org/wsvn/pgp-tools/trunk/
# 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
@@
-35,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$';
@@
-232,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';
}
};
@@
-247,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',
@@
-261,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',