switch to using spamc

[etc/mailfilter.git] / bin / train

diff --git a/bin/train b/bin/train
index 05a768f70c4c9e71ec4dc153829804b6dde9c7f5..4313c440a244b29bba9addf1504c9dc71c5c3f74 100755 (executable)
--- a/bin/train
+++ b/bin/train
@@ -5,17 +5,18 @@ USER=${USER:-$LOGNAME}
 DOMAIN=${DOMAIN:-$(hostname --fqdn)}
 
 NICE='/usr/bin/nice -20'
+NICE=''
 MAILFILTER=$HOME/.etc/mailfilter
 SA_PREFS="$MAILFILTER/spamassassin/user_prefs"
 MAILREAVER="$NICE $HOME/spamfilter/mailreaver.crm -u $MAILFILTER/crm114/"
 SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
-#SPAMC="$NICE /usr/bin/spamc -lxu ${USER}@${DOMAIN}"
-SA_REPORT="$SPAMASSASSIN --report"
-SA_REVOKE="$SPAMASSASSIN --revoke"
+SPAMC="$NICE /usr/bin/spamc -lx"
+SA_REPORT="$SPAMC -C report"
+SA_REVOKE="$SPAMC -C revoke"
 SA_LEARN="$NICE /usr/bin/sa-learn -p $SA_PREFS"
-SA_LEARN_HAM="$SA_LEARN --ham"
-SA_LEARN_SPAM="$SA_LEARN --spam"
-PRE_CLEANUP="$MAILFILTER/procmail/pre-spam-cleanup"
+SA_LEARN_HAM="$SPAMC -L ham"
+SA_LEARN_SPAM="$SPAMC -L spam"
+PRE_CLEANUP="$NICE $MAILFILTER/procmail/pre-spam-cleanup"
 
 HAM=0
 SPAM=0