Merge remote branch 'jrollins/master'
[monkeysphere.git] / src / monkeysphere-host
index 884c1b794524951d8ed90bb94339a5f2c9301952..72205ada4a395d562b35c72169ac3306fe5085ec 100755 (executable)
@@ -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
@@ -426,7 +427,7 @@ case $COMMAND in
        update_pgp_pub_file
        ;;
 
-    'version'|'v')
+    'version'|'--version'|'v')
        version
        ;;