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"
 

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 6d8f0ede36584265b2b0b0087d188f89b07391ae..ee5dd9582325baec5042f79ca6bea06cb41bcce8 100644 (file)
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -13,7 +13,7 @@
     SPAMTRAPPED
   }
 
     SPAMTRAPPED
   }
 

-  DESTDIR="$INBOX/.admin.`echo $EQ_DOMAIN | tr . _"
+  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"

 
   :0
   {
 
   :0
   {

diff --git a/procmail/rules/debian b/procmail/rules/debian
index 15ee1fad6b01189a94904d021a5e34e18692a997..e11dec0e677d041d06095dc635db4b4ff0a7969b 100644 (file)
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -1,10 +1,10 @@
 :0
 * ^X-Debian-PR-Source: \/.+
 * ? grep -q "^${MATCH}$" $CONF/debian-packages
 :0
 * ^X-Debian-PR-Source: \/.+
 * ? grep -q "^${MATCH}$" $CONF/debian-packages

-$INBOX/.debian.$MATCH/
+$BASE/.debian.$MATCH/

 
 :0
 * ORIGINAL_TO ?? ^madduck=debian\.org@forward\.madduck\.net$
 
 :0
 * ORIGINAL_TO ?? ^madduck=debian\.org@forward\.madduck\.net$

-$INBOX/.debian/
+$BASE/.debian/

 
 # vim:ft=procmail
 
 # vim:ft=procmail

diff --git a/procmail/rules/feeds b/procmail/rules/feeds
index 945fe55580a822e523f7121aec2fd6892f360f10..5f17bd64d95d685ed2f8f933fefeb96a8c5ee227 100644 (file)
--- a/procmail/rules/feeds
+++ b/procmail/rules/feeds
@@ -1,7 +1,7 @@
 :0
 * ORIG_DOMAIN ?? ^r2e\.madduck\.net$
 {
 :0
 * ORIG_DOMAIN ?? ^r2e\.madduck\.net$
 {

-  DESTDIR=$INBOX/.feeds
+  DESTDIR=$BASE/.feeds

 
   :0
   ${DESTDIR}/
 
   :0
   ${DESTDIR}/

diff --git a/procmail/rules/mass b/procmail/rules/mass
index 5fcb61d3145cf0fb08de4227b7cd0dc9b4e4524c..95827ea79adccdac8c8c4db1cd28396d1ec3a8a2 100644 (file)
--- a/procmail/rules/mass
+++ b/procmail/rules/mass
@@ -1,7 +1,7 @@
 :0
 * ORIG_DOMAIN ?? ^mass\.madduck\.net$
 {
 :0
 * ORIG_DOMAIN ?? ^mass\.madduck\.net$
 {

-  DESTDIR=$INBOX/.mass
+  DESTDIR=$BASE/.mass

 
   :0
   ${DESTDIR}/
 
   :0
   ${DESTDIR}/

diff --git a/procmail/rules/sudetia b/procmail/rules/sudetia
index 229ba1f11ce63be4c64580954c2f7b5cd90a30b8..e927a7484a5074bacdb839d62b11624ec0a4ea84 100644 (file)
--- a/procmail/rules/sudetia
+++ b/procmail/rules/sudetia
@@ -1,5 +1,5 @@
 :0
 * ORIGINAL_TO ?? ^madduck=sudetia.de@forward\.madduck\.net$
 :0
 * ORIGINAL_TO ?? ^madduck=sudetia.de@forward\.madduck\.net$

-$INBOX/.sudetia/
+$BASE/.sudetia/

 
 # vim:ft=procmail
 
 # vim:ft=procmail

diff --git a/procmail/spool-all b/procmail/spool-all
index ebfb1c91431a40105b587921f790ed29988bcc80..99f830b848c9bc8513a6b1fe03f3187570441e64 100644 (file)
--- a/procmail/spool-all
+++ b/procmail/spool-all
@@ -1,2 +1,2 @@
 :0 c
 :0 c

-$INBOX/.spool/
+$BASE/.spool/