Merge lp:~kermit666/ubuntu/precise/ssh-import-id/newline-fix into lp:~ssh-import-id/ssh-import-id/trunk.broke

[Dražen Lučanin]

In the current version, the authorized_keys file created doesn't contain any newlines between items and because of this my public key isn't recognized. After manually adding newlines between items, it started to work.

Because of this I wrote this patch to do this automatically. The sed command to remove all the newlines is still there, so that there won't be an uncontrolled number of newlines, but instead exactly 2 lines between each item. The patch has two benefits:
- fixes my bug, my key is now recognized
- makes the authorized_keys file more easily readable

The validation check still works.

=== modified file 'ssh-import-id'
--- ssh-import-id	2012-03-03 14:31:02 +0000
+++ ssh-import-id	2012-03-29 18:43:32 +0000
@@ -58,18 +58,23 @@
 
 validate_keys() {
 	# Prune blank lines, join lines that don't start with ^ssh-
-	# remove invalid characters
+	# remove invalid characters and add a controlled number of newlines
+        # (for readabililty and because items mustn't be in the same line)
 	LC_COLLATE=C \
 	sed -i	-e '/^$/d' \
-		-e '/^\r/d' \
+                -e '/^\r/d' \
 		-e ':join /^ssh-/!{ N; s/[\n\r]//g ; b join }' \
-		-e 's/[^a-zA-Z0-9@: .\/=+-]//g' "$1"
+		-e 's/[^a-zA-Z0-9@: .\/=+-]//g' "$1" \
+                -e '/^ssh-/a\\n'
 	# Count lines
 	lines=$(wc -l < "${1}")
 	# Count valid keys
 	keys=$(grep -c "^ssh-[dr]s[sa] [a-zA-Z0-9: .\/=+-]\+ " "$1")
+        # Multiply by 3 to account for 2 newlines after every item
+	keysmult=$(($keys * 3))
+        #keysmult=$[keys*3]
 	# Validate counts match, and >0
-	[ $lines -gt 0 ] && [ $keys -eq $lines ]
+	[ $lines -gt 0 ] && [ $keysmult -eq $lines ]
 }
 
 get_authkeypath() {
@@ -138,6 +143,7 @@
 	fi
 	echo >> "$tmp" # needed for wc
 	if ! validate_keys "$tmp"; then
+                #cat $tmp
 		warn "Invalid keys at [$url]"
  		rc=$(($rc+1));
 		continue