projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more tweaks to man pages
[monkeysphere.git]
/
src
/
monkeysphere
diff --git
a/src/monkeysphere
b/src/monkeysphere
index 0726ff94a61fdd492f6475978fec41bee711ba80..e84ee63c24254041bd05becd0d0d4b2ce4712099 100755
(executable)
--- a/
src/monkeysphere
+++ b/
src/monkeysphere
@@
-50,7
+50,7
@@
subcommands:
subkey-to-ssh-agent (s) store authentication subkey in ssh-agent
sshfpr (f) KEYID output ssh fingerprint of gpg key
subkey-to-ssh-agent (s) store authentication subkey in ssh-agent
sshfpr (f) KEYID output ssh fingerprint of gpg key
- keys-f
rom-userid (u) USERID
output valid keys for user id literal
+ keys-f
or-userid (u) USERID
output valid keys for user id literal
gen-subkey (g) [KEYID] generate an authentication subkey
--length (-l) BITS key length in bits (2048)
gen-subkey (g) [KEYID] generate an authentication subkey
--length (-l) BITS key length in bits (2048)
@@
-217,9
+217,13
@@
mkdir -p -m 0700 "$GNUPGHOME"
export LOG_LEVEL
export LOG_PREFIX
export LOG_LEVEL
export LOG_PREFIX
+if [ "$#" -eq 0 ] ; then
+ usage
+ failure "Please supply a subcommand."
+fi
+
# get subcommand
COMMAND="$1"
# get subcommand
COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
shift
case $COMMAND in
shift
case $COMMAND in
@@
-271,20
+275,25
@@
case $COMMAND in
gpg_ssh_fingerprint "$@"
;;
gpg_ssh_fingerprint "$@"
;;
- 'keys-from-userid'|'u')
- keys_from_userid "$@"
+ 'keys-for-userid'|'u')
+ keys_for_userid "$@"
+ ;;
+
+ 'keys-from-userid')
+ echo "Warning: 'keys-from-userid' is deprecated. Please use 'keys-for-userid' instead." >&2
+ keys_for_userid "$@"
;;
;;
- 'version'|'v')
+ 'version'|'
--version'|'
v')
version
;;
version
;;
- '
--help'|'
help'|'-h'|'h'|'?')
+ '
help'|'--
help'|'-h'|'h'|'?')
usage
;;
*)
failure "Unknown command: '$COMMAND'
usage
;;
*)
failure "Unknown command: '$COMMAND'
-T
ype
'$PGRM help' for usage."
+T
ry
'$PGRM help' for usage."
;;
esac
;;
esac