More cleanup:

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 69741e1c10df0aa177b9b7f903c6ccba8ad14510..782ba5ed0e329ff4e346df18de8190ac7dcd7039 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -136,6 +136,7 @@ mkdir -p -m 0700 "$GNUPGHOME"
 mkdir -p -m 0700 "$MS_HOME"
 mkdir -p "$hostKeysCacheDir"
 mkdir -p "$userKeysCacheDir"
+touch "$AUTHORIZED_USER_IDS"
 
 case $COMMAND in
     'update-known_hosts'|'update-known-hosts'|'k')
@@ -163,12 +164,21 @@ case $COMMAND in
        fi
        ;;
 
+    'update-userids'|'u')
+       if [ -z "$1" ] ; then
+           failure "you must specify at least one userid."
+       fi
+       for userID ; do
+           update_userid "$userID" "$userKeysCacheDir"
+       done
+       ;;
+
     'update-authorized_keys'|'update-authorized-keys'|'a')
        MODE='authorized_keys'
 
         # make sure authorized_user_ids file exists
        if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
-           failure "authorized_user_ids file is empty or does not exist."
+           failure "$AUTHORIZED_USER_IDS is empty."
        fi
 
        # set user-controlled authorized_keys file path
@@ -178,15 +188,6 @@ case $COMMAND in
        update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$userKeysCacheDir"
        ;;
 
-    'update-userids'|'u')
-       if [ -z "$1" ] ; then
-           failure "you must specify at least one userid."
-       fi
-       for userID ; do
-           update_userid "$userID" "$userKeysCacheDir"
-       done
-       ;;
-
     'gen-ae-subkey'|'g')
        keyID="$1"
        if [ -z "$keyID" ] ; then
@@ -201,6 +202,6 @@ case $COMMAND in
 
     *)
         failure "Unknown command: '$COMMAND'
-Type 'cereal-admin help' for usage."
+Type '$PGRM help' for usage."
         ;;
 esac