whatever

2 files changed, 12 insertions, 13 deletions

diff --git a/carddav-to-alpine b/carddav-to-alpine
index 1f852b9..db8db31 100755
--- a/carddav-to-alpine
+++ b/carddav-to-alpine
@@ -4,16 +4,6 @@
 
 error=0
 
-keys=(
-  'UID'
-  'EMAIL'
-  'FN'
-  'NICKNAME'
-  'FCC'
-  'COMMENT'
-  'REV'
-)
-
 touch "${git_dir}"'/uids'
 
 find "${git_dir}" \
@@ -64,13 +54,12 @@ find "${git_dir}" \
     "${_FCC}" \
     "${_COMMENT}" \
   | sed '
-    s@\t@ @
-    s@\t$@\n@
+    s@\t\+$@\n@
   ' >>"${git_dir}"'/uids'
 done
 
 sed '
-  s@^\S\+ @@
+  s@^\S\+\s@@
 ' "${git_dir}"'/uids' \
 >"${git_dir}"'/addressbook'
 
diff --git a/common b/common
index 3204673..93eba55 100644
--- a/common
+++ b/common
@@ -1,5 +1,15 @@
 #!/hint/bash
 
+keys=(
+  'UID'
+  'EMAIL'
+  'FN'
+  'NICKNAME'
+  'FCC'
+  'COMMENT'
+  'REV'
+)
+
 gen_rev() {
   printf 'REV:%s\n' "$(
     date -u -Iseconds \