1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00

* convert-from-106, lspgpot: Check for gpg binary before proceeding.

Don't hardcode the path to gpg.
This commit is contained in:
David Shaw 2004-01-12 02:45:14 +00:00
parent 2e7dc1ceb0
commit b45814907d
3 changed files with 19 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2004-01-11 David Shaw <dshaw@jabberwocky.com>
* convert-from-106, lspgpot: Check for gpg binary before
proceeding. Don't hardcode the path to gpg.
2003-12-28 David Shaw <dshaw@jabberwocky.com> 2003-12-28 David Shaw <dshaw@jabberwocky.com>
* gpgsplit.c (handle_bzip2): Remove two cut and paste typecast * gpgsplit.c (handle_bzip2): Remove two cut and paste typecast

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2002 Free Software Foundation, Inc. # Copyright (C) 2002, 2004 Free Software Foundation, Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -15,7 +15,12 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
gpg="../g10/gpg --no-greeting --no-secmem-warning"; if ! gpg --version > /dev/null 2>&1 ; then
echo "GnuPG not available!"
exit 1
fi
gpg="gpg --no-greeting --no-secmem-warning"
echo "This script converts your public keyring and trustdb from GnuPG" echo "This script converts your public keyring and trustdb from GnuPG"
echo "1.0.6 or earlier to the 1.0.7 and later format." echo "1.0.6 or earlier to the 1.0.7 and later format."

View File

@ -10,14 +10,18 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
../g10/gpg --dry-run --with-fingerprint --with-colons $* | awk ' if ! gpg --version > /dev/null 2>&1 ; then
echo "GnuPG not available!"
exit 1
fi
gpg --dry-run --with-fingerprint --with-colons $* | awk '
BEGIN { FS=":" BEGIN { FS=":"
printf "# Ownertrust listing generated by lspgpot\n" printf "# Ownertrust listing generated by lspgpot\n"
printf "# This can be imported using the command:\n" printf "# This can be imported using the command:\n"
printf "# ggp --import-ownertrust\n\n" } printf "# gpg --import-ownertrust\n\n" }
$1 == "fpr" { fpr = $10 } $1 == "fpr" { fpr = $10 }
$1 == "rtv" && $2 == 1 && $3 == 2 { printf "%s:3:\n", fpr; next } $1 == "rtv" && $2 == 1 && $3 == 2 { printf "%s:3:\n", fpr; next }
$1 == "rtv" && $2 == 1 && $3 == 5 { printf "%s:4:\n", fpr; next } $1 == "rtv" && $2 == 1 && $3 == 5 { printf "%s:4:\n", fpr; next }
$1 == "rtv" && $2 == 1 && $3 == 6 { printf "%s:5:\n", fpr; next } $1 == "rtv" && $2 == 1 && $3 == 6 { printf "%s:5:\n", fpr; next }
' '