From 658a9eff2a9885fb1b3bb62a72d8654f28bfb566 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sun, 15 Jun 2008 18:31:09 -0400
Subject: [PATCH] fix some output formatting.
---
src/monkeysphere | 13 +++++--------
src/monkeysphere-server | 14 +++++++-------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/monkeysphere b/src/monkeysphere
index 6369197..23ebd63 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -45,14 +45,12 @@ EOF
}
# generate a subkey with the 'a' usage flags set
-# FIXME: not working yet.
+# FIXME: this needs some tweaking to clean it up
gen_subkey(){
local keyID
local gpgOut
local userID
- log "warning: this function is still not working."
-
keyID="$1"
gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
@@ -60,8 +58,7 @@ gen_subkey(){
# return 1 if there only "tru" lines are output from gpg
if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
- log " key not found."
- return 1
+ failure "Key ID '$keyID' not found."
fi
# set subkey defaults
@@ -171,7 +168,7 @@ case $COMMAND in
for userID ; do
update_userid "$userID" "$userKeysCacheDir"
done
- log "run the following to update your monkeysphere authorized_keys file:"
+ log "Run the following to update your monkeysphere authorized_keys file:"
log "$PGRM update-authorized_keys"
;;
@@ -182,7 +179,7 @@ case $COMMAND in
for userID ; do
remove_userid "$userID"
done
- log "run the following to update your monkeysphere authorized_keys file:"
+ log "Run the following to update your monkeysphere authorized_keys file:"
log "$PGRM update-authorized_keys"
;;
@@ -204,7 +201,7 @@ case $COMMAND in
'gen-subkey'|'g')
keyID="$1"
if [ -z "$keyID" ] ; then
- failure "you must specify keyid of primary key."
+ failure "You must specify the key ID of your primary key."
fi
gen_subkey "$keyID"
;;
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 58eafaa..3cc7454 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -171,7 +171,7 @@ case $COMMAND in
'trust-keys'|'trust-key'|'t')
if [ -z "$1" ] ; then
- failure "you must specify at least one key to trust."
+ failure "You must specify at least one key to trust."
fi
# process key IDs
@@ -184,10 +184,10 @@ case $COMMAND in
uname="$1"
shift
if [ -z "$uname" ] ; then
- failure "you must specify user."
+ failure "You must specify user."
fi
if [ -z "$1" ] ; then
- failure "you must specify at least one userid."
+ failure "You must specify at least one user ID."
fi
# set variables for the user
@@ -202,7 +202,7 @@ case $COMMAND in
update_userid "$userID" "$cacheDir"
done
- log "run the following to update user's authorized_keys file:"
+ log "Run the following to update user's authorized_keys file:"
log "$PGRM update-users $uname"
;;
@@ -210,10 +210,10 @@ case $COMMAND in
uname="$1"
shift
if [ -z "$uname" ] ; then
- failure "you must specify user."
+ failure "You must specify user."
fi
if [ -z "$1" ] ; then
- failure "you must specify at least one userid."
+ failure "You must specify at least one user ID."
fi
# set variables for the user
@@ -227,7 +227,7 @@ case $COMMAND in
remove_userid "$userID"
done
- log "run the following to update user's authorized_keys file:"
+ log "Run the following to update user's authorized_keys file:"
log "$PGRM update-users $uname"
;;
--
2.34.1