Fix mutt-notmuch-tag

diff --git a/mutt-notmuch-tag b/mutt-notmuch-tag
index 9b80a19891c4c0def40e79fc290ea93718704bb3..16b81cf9a4a90068eb0191b78999ec4d50a8a99f 100755 (executable)
--- a/mutt-notmuch-tag
+++ b/mutt-notmuch-tag
@@ -2,20 +2,28 @@
 # Simple and crude script to tag multiple messagess in mutt using notmuch.
 # See http://upsilon.cc/~zack/blog/posts/2011/01/how_to_use_Notmuch_with_Mutt/
 
-grep "Message-ID" - > temp.txt
-sed -e 's|Message-ID:.*<\(.*\)>.*|id:\1|' temp.txt > temp1.txt
-sed '{:q;N;s/\n/ OR /g;t q}' temp1.txt > temp2.txt
+TMP="$HOME/temp/mutt/misc"
+
+grep "Message-ID" - > $TMP/notmuch-tag-id.txt
+sed -e 's|Message-ID:.*<\(.*\)>.*|id:\1|' $TMP/notmuch-tag-id.txt > $TMP/notmuch-tag-tmp.txt
+sed '{:q;N;s/\n/ OR /g;t q}' $TMP/notmuch-tag-tmp.txt > $TMP/notmuch-tag-tagged.txt
 
 ## When vi opens up list the tagging commands, e.g. +tag1 -tag2
-vi tags.txt
+vi $TMP/notmuch-tag-tags.txt
 
-TAGS=`cat tags.txt`
-SEARCHEXPR=`cat temp2.txt`
+TAGS=`cat $TMP/notmuch-tag-tags.txt`
+SEARCHEXPR=`cat $TMP/notmuch-tag-tagged.txt`
 
 ## For debugging
-echo "notmuch tag $TAGS -- $SEARCHEXPR" >> temp2.txt
+echo "notmuch tag $TAGS -- $SEARCHEXPR" >> $TMP/notmuch-tag-tagged.txt
 
 ## Now apply the tags
 notmuch tag $TAGS -- $SEARCHEXPR
 
+## Cleanup
+rm $TMP/notmuch-tag-id.txt
+rm $TMP/notmuch-tag-tmp.txt
+rm $TMP/notmuch-tag-tags.txt
+rm $TMP/notmuch-tag-tagged.txt
+
 # End of mutt-notmuch-tag.sh