Handle quotes without lead-in

[etc/mutt.git] / .lbdbrc

diff --git a/.lbdbrc b/.lbdbrc
index f169a48efb52c57d67145d01cf56ce24d52411ea..6420898497ab0bb336d208fec8023b030c397e13 100644 (file)
--- a/.lbdbrc
+++ b/.lbdbrc
@@ -1,17 +1,14 @@
-CONTACTS_DIR=$HOME/contacts
+METHODS=m_gpg
 
 : ${TMPDIR:=/tmp}
 
+CONTACTS_DIR=$HOME/contacts
 if [ -d $CONTACTS_DIR ]; then
   METHODS="$METHODS m_vcf"
   VCF_FILES="$TMPDIR/lbdbq.vcf"
-
-  VCF_TEMP="$(tempfile -d $TMPDIR -p lbdbq -s .vcf)"
-  cleanup() { rm -f $VCF_TEMP; trap - EXIT; }
-
-  for i in $CONTACTS_DIR/*; do case "${i##*/}" in ICE*) continue;; esac; cat "$i"; echo \r; done >| "$VCF_TEMP"
+  VCF_TEMP="$tmpdir/contacts.vcf"
+  for i in $CONTACTS_DIR/*; do case "${i##*/}" in ICE*) continue;; esac; cat "$i"; done >| "$VCF_TEMP"
   if ! cmp --quiet "$VCF_FILES" "$VCF_TEMP"; then
     mv "$VCF_TEMP" "$VCF_FILES"
   fi
-  cleanup
 fi