jaromail

commit 24edcce376e2a3636332bb61bc848407303694ca
parent 5078d312593cfe1c79d5f7eac5e2868c27da32e3
Author: Jaromil <jaromil@dyne.org>
Date:   Thu, 24 May 2012 15:44:14 +0200

now lbdb fully working in mutt

Diffstat:
M
install.sh
 | 
2
+-
M
src/jaro
 | 
4
+++-
M
src/mutt/general
 | 
2
--

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install.sh b/install.sh
@@ -184,7 +184,7 @@ for sh in lbdb-fetchaddr.sh.in lbdb-munge.sh.in lbdb_lib.sh.in lbdbq.sh.in; do
 	cat src/lbdb/$sh \
 	| sed -e "s&@SH@&/usr/bin/env zsh&g" \
 	| sed -e "s&@DOTLOCK@&${WORKDIR}/.lbdb/dotlock&g" \
-	| sed -e "s&@LBDB_FILE&${WORKDIR}/.lbdb/m_inmail.list&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" \
 	| sed -e "s&@exec_prefix@&${WORKDIR}/.lbdb&g" \
diff --git a/src/jaro b/src/jaro
@@ -685,6 +685,8 @@ set maildir_header_cache_verify=no
 set editor = "$EDITOR"
 set mailcap_path = "$WORKDIR/mailcap"
 
+# Little Brother Database
+set query_command = "$WORKDIR/bin/jaro -q query '%s'"
 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"
 
@@ -821,7 +823,7 @@ EOF
 
 query() {
     if [ $QUIET = 1 ]; then
-	${WORKDIR}/bin/lbdbq ${@} > /dev/null
+	${WORKDIR}/bin/lbdbq ${@}
 	exitcode=$?
     else
 	act -n "Query known address <${@}> in "
diff --git a/src/mutt/general b/src/mutt/general
@@ -26,8 +26,6 @@ set assumed_charset = us-ascii
 #set shell = retrieved from passwd file
 #set simple_search = "~f %s | ~s %s"
 
-# Little Brother Database
-set query_command = "lbdbq '%s'"
 
 
 ############