fix ul delivery

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index e3db0303f2b7cebe2420d95669b87efd381264a5..ca6bef4477ee9da82034e8cc113e8ddbbb7c7e9e 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,27 @@
-VERBOSE=yes
 :0
-*$ $DEST
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
-
-  :0
-  *$ DEST ?? ^$BASE/\.
-  { }
+* ! DEST ?? .
+{ DEST=/ }
 
-  :0 E
-  *$ DEST ?? ^\.
-  { DEST="$BASE/$DEST" }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
 
-  :0 E
-  { DEST="$BASE/.$DEST" }
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
 
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+:0
+*$ DEST ?? ^\.
+{ }
 
 :0 E
+{ DEST=".$DEST" }
+
+:0
 {
-  LOG="deliver:     delivering message $MSGID to default destination$NL"
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
   :0
-  $DEFAULT
+  $BASE/$DEST
 }