X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/4005966fcc096aa73e6bf3d7daa9adedee211e63..22ae42b9d0e4e2fc052da922ae9c20bc4862940e:/procmail/deliver diff --git a/procmail/deliver b/procmail/deliver index 4417af6..af2f70c 100644 --- a/procmail/deliver +++ b/procmail/deliver @@ -1,3 +1,12 @@ +:0 +*$ DEST ?? ^$NULL$ +{ + LOG="deliver: sending message $MSGID to $DEST$NL" + + :0 + $NULL +} + :0 * ! DEST ?? . { DEST=/ } @@ -11,14 +20,24 @@ { DEST="$MATCH" } :0 -*$ DEST ?? ^\. -{ } - -:0 E +*$ ! DEST ?? ^\. { DEST=".$DEST" } -TRAP="$TRAP; echo \"delivered: \$DESTFILE\" >> '$THISLOGFILE'" +:0 +* MARK_READ ?? . +{ + LOG="deliver: marking messages $MSGID as read because of $MARK_READ$NL" + TRAP="$TRAP; BASENAME=\"\${DESTFILE##*/}:2,S\"" + TRAP="$TRAP; DIRNAME=\"\${DESTFILE%/new/*}/cur\"" + TRAP="$TRAP; DESTFILE=\"\$DIRNAME/\$BASENAME\"" + TRAP="$TRAP; mv \"\$LASTFOLDER\" \"$BASE/\$DESTFILE\"" +} -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 +}