fix typo in monkeysphere usage

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 648f5e9886a61ca95349d81953232612c91283fe..0aa4a84722cfcb7751387338df923b7c0c28b1a2 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -3,7 +3,7 @@
 # monkeysphere: Monkeysphere client tool
 #
 # The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Micah Anderson <micah@riseup.net>
@@ -16,7 +16,7 @@ set -e
 
 PGRM=$(basename $0)
 
-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"}
 export SYSSHAREDIR
 . "${SYSSHAREDIR}/defaultenv"
 . "${SYSSHAREDIR}/common"
@@ -48,9 +48,9 @@ subcommands:
  ssh-proxycommand HOST [PORT]        monkeysphere ssh ProxyCommand
    --no-connect                        do not make TCP connection to host
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
- sshfpr (f) KEYID                    output ssh fingerprint of gpg key
 
- keys-for-userid (u) USERID          output valid keys for user id literal
+ keys-for-userid (u) USERID          output valid ssh keys for given user id
+ sshfprs-for-userid USERID           output ssh fingerprints for given user id
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
 
@@ -62,24 +62,13 @@ EOF
 
 # user gpg command to define common options
 gpg_user() {
-    gpg --no-greeting --quiet --no-tty "$@"
+    LC_ALL=C gpg --no-greeting --quiet --no-tty "$@"
 }
 
 # output the ssh fingerprint of a gpg key
 gpg_ssh_fingerprint() {
     keyid="$1"
-    local tmpfile=$(mktemp)
-
-    # trap to remove tmp file if break
-    trap "rm -f $tmpfile" EXIT
-
-    # use temporary file, since ssh-keygen won't accept keys on stdin
-    gpg_user --export "$keyid" | openpgp2ssh "$keyid" >"$tmpfile"
-    ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
-
-    # remove the tmp file
-    trap - EXIT
-    rm -rf "$tmpfile"
+    gpg_user --export "$keyid" --no-armor | "$SYSSHAREDIR/keytrans" openpgp2sshfpr "$keyid"
 }
 
 # take a secret key ID and check that only zero or one ID is provided,
@@ -167,7 +156,7 @@ check_gpg_authentication_subkey() {
 # set unset default variables
 GNUPGHOME=${GNUPGHOME:="${HOME}/.gnupg"}
 KNOWN_HOSTS="${HOME}/.ssh/known_hosts"
-HASH_KNOWN_HOSTS="true"
+HASH_KNOWN_HOSTS="false"
 AUTHORIZED_KEYS="${HOME}/.ssh/authorized_keys"
 
 # unset the check keyserver variable, since that needs to have
@@ -271,16 +260,24 @@ case $COMMAND in
        subkey_to_ssh_agent "$@"
        ;;
 
-    'sshfpr'|'f')
+    'sshfpr')
+       echo "Warning: 'sshfpr' is deprecated.  Please use 'sshfprs-for-userid' instead." >&2
        gpg_ssh_fingerprint "$@"
        ;;
 
     'keys-for-userid'|'u')
+       CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
        keys_for_userid "$@"
        ;;
 
+    'sshfprs-for-userid')
+       CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
+       keys_for_userid "$@" | "$SYSSHAREDIR/keytrans" sshfpr
+       ;;
+
     'keys-from-userid')
        echo "Warning: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
+       CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
        keys_for_userid "$@"
        ;;