switch to deliver rc

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index 7a7b9a9a5e29736cd63f7c97aec0e68fa34973c3..4417af67a3ee44a97f39fbce9bd17fc19959cea8 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,14 +1,24 @@
 :0
 :0

-*$ $DEST
-{
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+* ! DEST ?? .
+{ DEST=/ }
+
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
+
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
+
+:0
+*$ DEST ?? ^\.
+{ }

 
 :0 E
 
 :0 E

-{
-  LOG="deliver:     delivering message $MSGID to default destination$NL"
-  :0
-  $DEFAULT
-}
+{ DEST=".$DEST" }
+
+TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
+LOG="deliver:     delivering message $MSGID to $DEST$NL"
+:0
+$BASE/$DEST