Abstract out GIT_HOST

[bin.git] / learn_from_spam

diff --git a/learn_from_spam b/learn_from_spam
index bb721e16900d1ef368801a454f5fb106d7e28466..35a25f6f5fb5214cd99796b90a8ecd68b6034d9b 100755 (executable)
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -11,8 +11,8 @@ HAM_REPORT="spamc --learntype=ham"
 SPAM_CHECK="spamc -c"
 
 # needs rules directories
-NEEDS_SPAM_RULES=~/Maildir/spam/needs_rules
-NEEDS_HAM_RULES=~/Maildir/spam/needs_ham_rules
+NEEDS_SPAM_RULES="$(echo ~/Maildir/spam/needs_rules)"
+NEEDS_HAM_RULES="$(echo ~/Maildir/spam/needs_ham_rules)"
 
 if [ "$(basename $0)" = "learn_from_spam" ]; then
     for file in "$@"; do
@@ -21,8 +21,8 @@ if [ "$(basename $0)" = "learn_from_spam" ]; then
         fi;
         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
+        # check to see if it's still ham
+        if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
             mkdir -p "${NEEDS_SPAM_RULES}/cur";
             TMP="$(mktemp -d)"
             trap "rm -f '$TMP'/file; rmdir '$TMP'" EXIT
@@ -39,7 +39,7 @@ 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 --add-to-whitelist >/dev/null 2>&1;
-        if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+        if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
             mkdir -p "${NEEDS_HAM_RULES}/cur";
             TMP="$(mktemp -d)"
             trap "rm -f '$TMP'/file; rmdir '$TMP'" EXIT