multiple logical fixes in vcard updater

[confetti] / pages / attendees.sh

diff --git a/pages/attendees.sh b/pages/attendees.sh
index aecc95d26c4bc9c5fc324ffb0f857c0b9e518a40..4a352ca89724f8d3f7226f288f4b8975db6232cb 100755 (executable)
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -35,8 +35,8 @@ vcf_parse() {
     s:^X-MS-CARDPICTURE:001 PHOTO:p;
     s:^LOGO:002 LOGO:p;
     s:^FN:003 FN:p;
+    s:^N[\:;]:004 &:p
     s:^NICKNAME:005 NICKNAME:p;
-    s:^N:004 N:p
     s:^SOUND:006 SOUND:p;
     s:^GENDER:007 GENDER:p;
     s:^X-GENDER:007 GENDER:p;
@@ -102,7 +102,7 @@ vcf_parse() {
 
     s:^([A-Z].*)$:024 \1:p;
     ' \
-  | sort |while read -r line; do
+  |sort |while read -r line; do
     case "$line" in
       00[012]*)
        echo -E "$line"
@@ -124,7 +124,7 @@ vcf_parse() {
        ;;
       *)
         [ -n "$n" ] && fn="$n"
-       [ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
+       #[ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
        [ -n "$fn" ] && echo -E "003 FN:$fn" \
                      || echo -E "003 FN:$nick"
        echo -E "$line"