From a6b4d01228cc8dd76b672b4a1d9e7c5a499a9735 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Sat, 13 Nov 2021 11:15:29 +0100
Subject: refactor

---
 carddav-to-alpine | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/carddav-to-alpine b/carddav-to-alpine
index d6310b2..4ed3550 100755
--- a/carddav-to-alpine
+++ b/carddav-to-alpine
@@ -20,8 +20,8 @@ find "${git_dir}" \
   -type f \
   -name '*.vcs' \
   -printf '%p\n' \
-| while read -r f; do
-  uid="${f##*/}"
+| while read -r address_file; do
+  uid="${address_file##*/}"
   uid="${uid%.vcs}"
 
   for key in "${keys[@]}"; do
@@ -35,16 +35,20 @@ find "${git_dir}" \
       s@\t@ @g
       s@\r$@@
       /^BEGIN:VCARD$/,/END:VCARD$/ {
-        /^\('"$(printf '%s\\|' "${keys[@]}" | sed 's@\\|$@@')"'\):/ {
+        /^\('"$(
+          printf '%s\\|' "${keys[@]}" \
+          | sed 's@\\|$@@'
+        )"'\):/ {
           s@:@ @
           p
         }
       }
-    ' "$f"
+    ' "${address_file}"
   )
 
   if [ "${_UID}" != "${uid}" ]; then
-    >&2 printf 'uids differ: "%s" != "%s"\n' "${uid}" "${_UID}"
+    >&2 printf 'uids differ in %s: "%s" != "%s"\n' \
+      "${address_file##*/}" "${uid}" "${_UID}"
     error=1
     continue
   fi
@@ -58,7 +62,8 @@ find "${git_dir}" \
     "${_COMMENT}" \
   | sed '
     s@\t\+$@\n@
-  ' >>"${git_dir}"'/uids'
+  ' \
+  >>"${git_dir}"'/uids'
 done
 
 sed '
-- 
cgit v1.2.3-54-g00ecf