add add to blacklist and remove from whitelist to learn_from_spam

[bin.git] / learn_from_spam

diff --git a/learn_from_spam b/learn_from_spam
index d061e45a72f64a768a92e8206a78b8aa270c0484..7d7c7fae24b97850a52277200ce7455ece41ae12 100755 (executable)
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -13,20 +13,21 @@ SPAM_CHECK="spamc -c"
 if [ "$(basename $0)" = "learn_from_spam" ]; then
     for file in "$@"; do
         $SPAM_REPORT < "$file" >/dev/null 2>&1;
-        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin -R >/dev/null 2>&1;
+        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin --add-to-blacklist >/dev/null 2>&1;
+        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin --remove-from-whitelist >/dev/null 2>&1;
         # check to see if it's still spam
         if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
             # this message is still not spam; may need custom rules
-            spamc "$file" > ~/Maildir/spam/needs_rules/cur/"$(basename "$file")" 2>/dev/null;
+            spamc < "$file" > ~/Maildir/spam/needs_rules/cur/"$(basename "$file")" 2>/dev/null;
         fi;
     done;
 elif [ "$(basename $0)" = "learn_from_ham" ]; then
     for file in "$@"; do
         $HAM_REPORT < "$file" >/dev/null 2>&1;
-        formail -c < "$file" |grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: '|spamassassin -W >/dev/null 2>&1;
+        formail -c < "$file" |grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: '|spamassassin --add-to-whitelist >/dev/null 2>&1;
         if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
             mkdir -p ~/Maildir/spam/needs_ham_rules/cur;
-            spamc "$file" > ~/Maildir/spam/needs_ham_rules/cur/"$(basename "$file")" 2>/dev/null;
+            spamc < "$file" > ~/Maildir/spam/needs_ham_rules/cur/"$(basename "$file")" 2>/dev/null;
         fi;
     done;
 else