carddav-to-alpine: sanity check + write addressbook from scratch

1 files changed, 8 insertions, 5 deletions

diff --git a/carddav-to-alpine b/carddav-to-alpine
index db8db31..d6310b2 100755
--- a/carddav-to-alpine
+++ b/carddav-to-alpine
@@ -4,7 +4,14 @@
 
 error=0
 
-touch "${git_dir}"'/uids'
+for file in 'addressbook' 'uids'; do
+  if [ -n $(git -C "${git_dir}" diff -- "${file}") ]; then
+    >&2 printf 'File "%s" was changed relative to git.\n' "${file##*/}"
+    exit 1
+  fi
+  rm -f "${git_dir}"'/'"${file}"
+  touch "${git_dir}"'/'"${file}"
+done
 
 find "${git_dir}" \
   -name '.git' \
@@ -42,10 +49,6 @@ find "${git_dir}" \
     continue
   fi
 
-  sed -i '
-    /^'"${uid}"' /d
-  ' "${git_dir}"'/uids'
-
   printf '%s\t' \
     "${_UID}" \
     "${_NICKNAME}" \