From: martin f. krafft <madduck@seamus.madduck.net>
Date: Wed, 15 Aug 2007 14:05:47 +0000 (+0200)
Subject: rename INBOX to BASE
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/90b680896df34b1a64d4541ceea5491a58136558?ds=sidebyside

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"
 
diff --git a/procmail/rules/admin b/procmail/rules/admin
index 6d8f0ed..ee5dd95 100644
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -13,7 +13,7 @@
     SPAMTRAPPED
   }
 
-  DESTDIR="$INBOX/.admin.`echo $EQ_DOMAIN | tr . _"
+  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
 
   :0
   {
diff --git a/procmail/rules/debian b/procmail/rules/debian
index 15ee1fa..e11dec0 100644
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -1,10 +1,10 @@
 :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$
-$INBOX/.debian/
+$BASE/.debian/
 
 # vim:ft=procmail
diff --git a/procmail/rules/feeds b/procmail/rules/feeds
index 945fe55..5f17bd6 100644
--- a/procmail/rules/feeds
+++ b/procmail/rules/feeds
@@ -1,7 +1,7 @@
 :0
 * ORIG_DOMAIN ?? ^r2e\.madduck\.net$
 {
-  DESTDIR=$INBOX/.feeds
+  DESTDIR=$BASE/.feeds
 
   :0
   ${DESTDIR}/
diff --git a/procmail/rules/mass b/procmail/rules/mass
index 5fcb61d..95827ea 100644
--- a/procmail/rules/mass
+++ b/procmail/rules/mass
@@ -1,7 +1,7 @@
 :0
 * ORIG_DOMAIN ?? ^mass\.madduck\.net$
 {
-  DESTDIR=$INBOX/.mass
+  DESTDIR=$BASE/.mass
 
   :0
   ${DESTDIR}/
diff --git a/procmail/rules/sudetia b/procmail/rules/sudetia
index 229ba1f..e927a74 100644
--- a/procmail/rules/sudetia
+++ b/procmail/rules/sudetia
@@ -1,5 +1,5 @@
 :0
 * ORIGINAL_TO ?? ^madduck=sudetia.de@forward\.madduck\.net$
-$INBOX/.sudetia/
+$BASE/.sudetia/
 
 # vim:ft=procmail
diff --git a/procmail/spool-all b/procmail/spool-all
index ebfb1c9..99f830b 100644
--- a/procmail/spool-all
+++ b/procmail/spool-all
@@ -1,2 +1,2 @@
 :0 c
-$INBOX/.spool/
+$BASE/.spool/