X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/638a5556b1da40dfed06a501546ee46a07974bce..e7f74ffe7d6447eff2f5432f74a16cbf3e7b7508:/bin/train

diff --git a/bin/train b/bin/train
index 4313c44..e9b3426 100755
--- a/bin/train
+++ b/bin/train
@@ -8,14 +8,14 @@ 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 -lx"
-SA_REPORT="$SPAMC -C report"
-SA_REVOKE="$SPAMC -C revoke"
+MAILREAVER="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILTER/crm114/"
+SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
+SPAMC="$NICE /usr/bin/spamc --log-to-stderr"
+SA_REPORT="$SPAMC --reporttype=report"
+SA_REVOKE="$SPAMC --reporttype=revoke"
 SA_LEARN="$NICE /usr/bin/sa-learn -p $SA_PREFS"
-SA_LEARN_HAM="$SPAMC -L ham"
-SA_LEARN_SPAM="$SPAMC -L spam"
+SA_LEARN_HAM="$SPAMC --learntype=ham"
+SA_LEARN_SPAM="$SPAMC --learntype=spam"
 PRE_CLEANUP="$NICE $MAILFILTER/procmail/pre-spam-cleanup"
 
 HAM=0