jaromail

commit 5078d312593cfe1c79d5f7eac5e2868c27da32e3
parent 15a9dfbf7a0095dc9991839ec41348dc5e657d9c
Author: Jaromil <jaromil@dyne.org>
Date:   Thu, 24 May 2012 15:33:06 +0200

more lbdb fixes

Diffstat:
M
install.sh
 | 
8
+++++---
M
src/jaro
 | 
4
++++
M
src/lbdb/lbdb-munge.sh.in
 | 
2
+-
M
src/lbdb/lbdbq.sh.in
 | 
2
+-
M
src/mutt/keybindings
 | 
2
--

5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/install.sh b/install.sh
@@ -183,7 +183,7 @@ for sh in lbdb-fetchaddr.sh.in lbdb-munge.sh.in lbdb_lib.sh.in lbdbq.sh.in; do
 	dst=`echo $sh | sed -e 's/.sh.in$//'`
 	cat src/lbdb/$sh \
 	| sed -e "s&@SH@&/usr/bin/env zsh&g" \
-	| sed -e "s&@DOTLOCK@&mutt_dotlock&g" \
+	| sed -e "s&@DOTLOCK@&${WORKDIR}/.lbdb/dotlock&g" \
 	| sed -e "s&@LBDB_FILE&${WORKDIR}/.lbdb/m_inmail.list&g" \
 	| sed -e "s&@LBDB_VERSION@&0.38-jaromail&g" \
 	| sed -e "s&@prefix@&${WORKDIR}/.lbdb&g" \
@@ -191,7 +191,8 @@ for sh in lbdb-fetchaddr.sh.in lbdb-munge.sh.in lbdb_lib.sh.in lbdbq.sh.in; do
 	| sed -e "s&@libdir@&${WORKDIR}/.lbdb&g" \
 	| sed -e "s&@sysconfdir@&${WORKDIR}/.lbdb&g" \
 	| sed -e "s&@MODULES@&${WORKDIR}/.lbdb&g" \
-	| sed -e "s&@TAC@&${WORKDIR}/.lbdb/tac.awk&g" \
+	| sed -e "s&@TAC@&${WORKDIR}/.lbdb/tac&g" \
+        | sed -e "s&@TMPDIR@&${WORKDIR}/tmp&g" \
         > $WORKDIR/.lbdb/${dst}
 done
 lbdb_modules=(m_finger m_gpg m_inmail m_muttalias m_osx_addressbook m_vcf)
@@ -246,7 +247,8 @@ EOF
 esac
 	
 notice "Installation completed" #, now edit your personal settings:"
-
+act "Now edit your personal settings, accounts and filters in:"
+act "$WORKDIR"
 
 # OS specific post install rules
 case $OS in
diff --git a/src/jaro b/src/jaro
@@ -684,6 +684,10 @@ set header_cache= $WORKDIR/cache
 set maildir_header_cache_verify=no
 set editor = "$EDITOR"
 set mailcap_path = "$WORKDIR/mailcap"
+
+macro index,pager A "<pipe-message>$WORKDIR/bin/jaro -q learn" "add the sender address to lbdb"
+macro index,pager + "<pipe-message>$WORKDIR/bin/jaro -q learn" "add the sender address to lbdb"
+
 EOF
 
     if [ -r $MUTTDIR/general ]; then
diff --git a/src/lbdb/lbdb-munge.sh.in b/src/lbdb/lbdb-munge.sh.in
@@ -28,7 +28,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 dotlock=@DOTLOCK@
 fetchaddr=@libdir@/fetchaddr
-db=$HOME/.lbdb/m_inmail.list
+db=@LBDB_FILE@
 
 if [ "$SORT_OUTPUT" = "false" -o "$SORT_OUTPUT" = "no" ]
 then
diff --git a/src/lbdb/lbdbq.sh.in b/src/lbdb/lbdbq.sh.in
@@ -29,7 +29,7 @@ sysconfdir=@sysconfdir@
 METHODS="@MODULES@"
 MODULES_PATH=@libdir@
 TAC=@TAC@
-
+TMPDIR=@TMPDIR@
 case "$1" in
     -v|--version)
 	echo "lbdbq version $LBDB_VERSION"
diff --git a/src/mutt/keybindings b/src/mutt/keybindings
@@ -28,8 +28,6 @@ bind pager <left> previous-entry
 # Little Brother Database settings
 # bind index,pager 	Q	     query
 bind editor 	<tab>	 complete-query
-macro index,pager A "<pipe-message>lbdb-fetchaddr -a" "add the sender address to lbdb"
-macro index,pager + "<pipe-message>lbdb-fetchaddr -a" "add the sender address to lbdb"
 
 macro pager \ef "|view-x-face<enter>" "display the X-Face included in the mail"