Merge commit 'micah/master'

[monkeysphere.git] / src / subcommands / ma / list-certifiers

diff --git a/src/subcommands/ma/list-certifiers b/src/subcommands/ma/list-certifiers
old mode 100755 (executable)
new mode 100644 (file)
index e920888..e37485e
--- a/src/subcommands/ma/list-certifiers
+++ b/src/subcommands/ma/list-certifiers
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
 
 # Monkeysphere authentication list-certifiers subcommand
 #
@@ -7,8 +8,8 @@
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
 
 # list the host certifiers
 
@@ -18,12 +19,12 @@ local keys
 local key
 
 # find trusted keys in authentication keychain
-keys=$(gpg_authentication "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-keys --with-colons --fingerprint" | \
+keys=$(gpg_sphere "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-keys --with-colons --fingerprint" | \
     grep ^pub: | cut -d: -f2,5 | egrep '^(u|f):' | cut -d: -f2)
 
 # output keys
 for key in $keys ; do
-    gpg_authentication "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key --fingerprint $key"
+    gpg_sphere "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key --fingerprint $key"
 done
 
 }