From: martin f. krafft Date: Wed, 15 Aug 2007 13:53:58 +0000 (+0200) Subject: rename INBOX to BASE X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/0388b828a2e99944d75fc8d30a57ade1640fe8e6?hp=4ba2f39737ab0344a5b1d0ab05dd1743a3f98dd0 rename INBOX to BASE --- diff --git a/procmail/defines b/procmail/defines index c825b51..cd1240e 100644 --- a/procmail/defines +++ b/procmail/defines @@ -35,10 +35,10 @@ TRAINER="$MAILFILT/bin/train" OURDATE=`date -R` OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N` -INBOX=$HOME/.maildir +BASE=$HOME/.maildir #DEFAULT="|$DELIVER" -DEFAULT=$INBOX/ +DEFAULT=$BASE/ ORGMAIL=$HOME/BOUNCED-MAIL # maximum message size for spam checking @@ -68,8 +68,8 @@ RE_LASTNAME="kraff?t" RE_EXTRACT_HEADER_VALUE="[ ]*\/[^ ].*" NULL=/dev/null -DISCARD=$INBOX/.discard/ -#DISCARD="'|$DELIVER -m INBOX.discard'" +DISCARD=$BASE/.discard/ +#DISCARD="'|$DELIVER -m BASE.discard'" ### variables from the message diff --git a/procmail/handlespam b/procmail/handlespam index 809e92d..cab35eb 100644 --- a/procmail/handlespam +++ b/procmail/handlespam @@ -34,7 +34,7 @@ { LOG="spamfilter: filing as unsure$NL" :0 - $INBOX/.retrain.unsure/ + $BASE/.retrain.unsure/ } :0 E @@ -42,7 +42,7 @@ { LOG="spamfilter: filing as disagreed$NL" :0 - $INBOX/.retrain.disagree/ + $BASE/.retrain.disagree/ } :0 E @@ -70,7 +70,7 @@ { LOG="spamfilter: filing as spam$NL" :0 - $INBOX/.spam/ + $BASE/.spam/ } :0 diff --git a/procmail/logging b/procmail/logging index 04e03b6..516049d 100644 --- a/procmail/logging +++ b/procmail/logging @@ -20,7 +20,7 @@ from: $FROM original-to: $ORIGINAL_TO subject: $SUBJECT$NL" -TRAP="echo \"delivered: \${LASTFOLDER#$INBOX/}\" >> '$THISLOGFILE'; +TRAP="echo \"delivered: \${LASTFOLDER#$BASE/}\" >> '$THISLOGFILE'; echo >> '$THISLOGFILE'; egrep -v '^(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"