only add base to dest later on

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index 928d52ce52e851d69081547dd4051d7a2b4b6d09..c3188ff55d82eebcb050f25a80ce1edd7fcf813f 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,16 +1,23 @@
-VERBOSE=yes

 :0
 :0

-*$ $DEST
+* DEST ?? .

 {
   :0
   * DEST ?? .+[^/]$
   { DEST="$DEST/" }
 
 {
   :0
   * DEST ?? .+[^/]$
   { DEST="$DEST/" }
 

-  :0 E
+  :0
+  *$ DEST ?? ^$BASE/\/.+
+  { DEST="$MATCH" }
+
+  :0

   *$ DEST ?? ^\.
   *$ DEST ?? ^\.

-  { DEST="$BASE/$DEST" }
+  { }
+
+  :0 E
+  { DEST=".$DEST" }

 
   LOG="deliver:     delivering message $MSGID to $DEST$NL"
 
   LOG="deliver:     delivering message $MSGID to $DEST$NL"

+  DEST="$BASE/$DEST"

   :0
   $DEST
 }
   :0
   $DEST
 }