X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-host;h=6145c30fb8227395fe4e0ca9bdafac71cea3a0cb;hb=4513721ec1270d51106eba30e54b8326f333701f;hp=17330216301a7ef412054269a0986b0637c77c66;hpb=3c02ca7796760898c44678e6cf325fa4d0ae29d7;p=monkeysphere.git diff --git a/src/monkeysphere-host b/src/monkeysphere-host index 1733021..6145c30 100755 --- a/src/monkeysphere-host +++ b/src/monkeysphere-host @@ -256,11 +256,12 @@ multi_key() { shift local keys=$@ local i=0 - local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE")) local key check_no_keys + local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE")) + if [[ -z "$1" || "$1" == '--all' ]] ; then keys="${fprs[@]}" fi @@ -378,7 +379,7 @@ COMMAND="$1" shift case $COMMAND in - 'import-key'|'i') + 'import-key'|'import'|'i') source "${MHSHAREDIR}/import_key" import_key "$@" ;; @@ -387,7 +388,7 @@ case $COMMAND in multi_key show_key "$@" ;; - 'set-expire'|'extend-key'|'e') + 'set-expire'|'extend-key'|'extend'|'e') source "${MHSHAREDIR}/set_expire" set_expire "$@" ;;