summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-01 13:49:37 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-01 13:49:37 -0500
commit2232cf43eed47ab45c7f39ca66cfbde54a602d59 (patch)
tree105df395de17e8ed4460d9144ec55ff036d51dc9 /src
parent15d752f93a3a9807430fe8b3cd6e16f3cede8e7c (diff)
parent714735a79cd33760a44a7c7356d8d8c44776cc5f (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index 6db4827..809b1ac 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -69,7 +69,7 @@ check_gpg_sec_key_id() {
gpgSecOut=$(gpg_user --fixed-list-mode --list-secret-keys --with-colons 2>/dev/null | egrep '^sec:')
;;
1)
- gpgSecOut=$(gpg_user --fixed-list-mode --list-secret-keys --with-colons "$keyID" | egrep '^sec:') || failure
+ gpgSecOut=$(gpg_user --fixed-list-mode --list-secret-keys --with-colons "$1" | egrep '^sec:') || failure
;;
*)
failure "You must specify only a single primary key ID."
@@ -86,9 +86,9 @@ check_gpg_sec_key_id() {
echo "$gpgSecOut" | cut -d: -f5
;;
*)
- echo "Multiple primary secret keys found:"
- echo "$gpgSecOut" | cut -d: -f5
- echo "Please specify which primary key to use."
+ echo "Multiple primary secret keys found:" >&2
+ echo "$gpgSecOut" | cut -d: -f5 >&2
+ echo "Please specify which primary key to use." >&2
failure
;;
esac