only add base to dest later on

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

 :0
 :0

-*$ $DEST
+* DEST ?? .

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

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

 
 

-  :0 E
+  :0

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

-  { DEST="$BASE/$DEST" }
+  { }

 
   :0 E
 
   :0 E

-  { DEST="$BASE/.$DEST" }
+  { 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
 }