rename INBOX to BASE

diff --git a/procmail/defines b/procmail/defines
index c825b51fbfdc2326b02bc8316f175302a109aebc..cd1240e12be851dfe10b32ca302d978c59f6549b 100644 (file)
--- 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`
 
 OURDATE=`date -R`
 OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
 

-INBOX=$HOME/.maildir
+BASE=$HOME/.maildir

 
 #DEFAULT="|$DELIVER"
 
 #DEFAULT="|$DELIVER"

-DEFAULT=$INBOX/
+DEFAULT=$BASE/

 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
 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
 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
 
 
 ### variables from the message
 

diff --git a/procmail/handlespam b/procmail/handlespam
index 809e92d412fc82f82addde4a6b663131431f5c0a..cab35eb6f47f9879ca35f0b57b9f95015406c1b8 100644 (file)
--- a/procmail/handlespam
+++ b/procmail/handlespam
@@ -34,7 +34,7 @@
 {
   LOG="spamfilter:  filing as unsure$NL"
   :0
 {
   LOG="spamfilter:  filing as unsure$NL"
   :0

-  $INBOX/.retrain.unsure/
+  $BASE/.retrain.unsure/

 }
 
 :0 E
 }
 
 :0 E


@@ -42,7 +42,7 @@
 {
   LOG="spamfilter:  filing as disagreed$NL"
   :0
 {
   LOG="spamfilter:  filing as disagreed$NL"
   :0

-  $INBOX/.retrain.disagree/
+  $BASE/.retrain.disagree/

 }
 
 :0 E
 }
 
 :0 E


@@ -70,7 +70,7 @@
 {
   LOG="spamfilter:  filing as spam$NL"
   :0
 {
   LOG="spamfilter:  filing as spam$NL"
   :0

-  $INBOX/.spam/
+  $BASE/.spam/

 }
 
 :0
 }
 
 :0

diff --git a/procmail/logging b/procmail/logging
index 04e03b6e0e79e2812baa2f6e99e93bc14c535a6f..516049d20151ef524611662568365eba9adc7b39 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -20,7 +20,7 @@ from:        $FROM
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 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"
 
       echo >> '$THISLOGFILE';
       egrep -v '^(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"