From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Jun 2008 03:42:41 +0000 (-0400)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.1-1~17
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=18c15c1adf65d47df5b3753c99f06092d81906d0;hp=8a977a8371f2ea54e3888494e1b474befeba318b;p=monkeysphere.git

Merge commit 'micah/master'
---

diff --git a/src/common b/src/common
index 7a90453..ac43f0a 100644
--- a/src/common
+++ b/src/common
@@ -120,7 +120,7 @@ ssh2authorized_keys() {
     key="$2"
 
     echo -n "$key" | tr -d '\n'
-    echo " MonkeySphere${DATE}: ${userID}"
+    echo " MonkeySphere${DATE} ${userID}"
 }
 
 # convert key from gpg to ssh known_hosts format
@@ -153,7 +153,7 @@ gpg2authorized_keys() {
     # following regexp:
     # '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}$'
     gpg2ssh "$keyID" | tr -d '\n'
-    echo " MonkeySphere${DATE}: ${userID}"
+    echo " MonkeySphere${DATE} ${userID}"
 }
 
 ### GPG UTILITIES
@@ -507,7 +507,7 @@ process_authorized_keys() {
 	    comment="$key"
 	fi
 
-	if echo "$comment" | egrep -v -q '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}:' ; then
+	if echo "$comment" | egrep -v -q '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}' ; then
 	    continue
 	fi
 	userID=$(echo "$comment" | awk "{ print $2 }")