X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0f4bcee75353935ff9bc605f7e0b31d12e302605..721bb27ffd590921fc1d111756481161a11fb521:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index 5a4f355..ca6bef4 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,6 +1,6 @@
 :0
 * ! DEST ?? .
-{ DEST="$DEFAULT" }
+{ DEST=/ }
 
 :0
 * DEST ?? .+[^/]$
@@ -17,10 +17,11 @@
 :0 E
 { DEST=".$DEST" }
 
-TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
-      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
-      $TRAP"
-
-LOG="deliver:     delivering message $MSGID to $DEST$NL"
 :0
-$BASE/$DEST
+{
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
+  :0
+  $BASE/$DEST
+}