aboutsummaryrefslogtreecommitdiffstats
path: root/tools/convert-from-106
diff options
context:
space:
mode:
Diffstat (limited to 'tools/convert-from-106')
-rwxr-xr-xtools/convert-from-1069
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/convert-from-106 b/tools/convert-from-106
index b8225d28e..634152b11 100755
--- a/tools/convert-from-106
+++ b/tools/convert-from-106
@@ -1,5 +1,5 @@
#!/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
# 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
# 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 "1.0.6 or earlier to the 1.0.7 and later format."