diff options
author | Eric Wong <e@80x24.org> | 2016-08-20 00:25:16 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-08-21 09:26:47 +0000 |
commit | 52762ddc300db09aee3ad975a0efb6942343e779 (patch) | |
tree | 34a1da13ce9f67d10432a36af438afb6d286b314 /scripts | |
parent | 303356a9125ab33e68604bae49be548575b40a84 (diff) | |
download | public-inbox-52762ddc300db09aee3ad975a0efb6942343e779.tar.gz |
This makes us closer to git.git style (though I'm not quite sure why we do this...)
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/dc-dlvr | 4 | ||||
-rw-r--r-- | scripts/dc-dlvr.pre | 6 | ||||
-rwxr-xr-x | scripts/report-spam | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr index a38760f5..81193b23 100755 --- a/scripts/dc-dlvr +++ b/scripts/dc-dlvr @@ -57,14 +57,14 @@ err=$? set -e case $err in -1) $DELIVER -m INBOX.spam < $TMPMSG ;; +1) $DELIVER -m INBOX.spam <$TMPMSG ;; *) # users may override normal delivery and have it go elsewhere if test -r ~/.dc-dlvr.rc then . ~/.dc-dlvr.rc else - $DELIVER -m INBOX < $TMPMSG + $DELIVER -m INBOX <$TMPMSG fi ;; esac diff --git a/scripts/dc-dlvr.pre b/scripts/dc-dlvr.pre index c10e80c7..d7bc1b5c 100644 --- a/scripts/dc-dlvr.pre +++ b/scripts/dc-dlvr.pre @@ -5,7 +5,7 @@ export PATH=/usr/local/bin:/usr/bin:/bin trap 'err=$?; set +e; test $err -eq 0 || rm -f $TMPMSG; exit $err' EXIT case $1,$CLIENT_ADDRESS in -pispam,) exec public-inbox-learn spam < $TMPMSG ;; -piham,) exec public-inbox-learn ham < $TMPMSG ;; +pispam,) exec public-inbox-learn spam <$TMPMSG ;; +piham,) exec public-inbox-learn ham <$TMPMSG ;; esac -exec public-inbox-mda < $TMPMSG +exec public-inbox-mda <$TMPMSG diff --git a/scripts/report-spam b/scripts/report-spam index 0015ef0b..325f5718 100755 --- a/scripts/report-spam +++ b/scripts/report-spam @@ -32,14 +32,14 @@ PI_USER=pi case $1 in *[/.]spam/cur/*) # non-new messages in spam get trained - $DO_SENDMAIL $PI_USER+pispam < $1 - exec $DO_SENDMAIL $USER+trainspam < $1 + $DO_SENDMAIL $PI_USER+pispam <$1 + exec $DO_SENDMAIL $USER+trainspam <$1 ;; *:2,*S*) # otherwise, seen messages only case $1 in *:2,*T*) exit 0 ;; # ignore trashed messages esac - $DO_SENDMAIL $PI_USER+piham < $1 - exec $DO_SENDMAIL $USER+trainham < $1 + $DO_SENDMAIL $PI_USER+piham <$1 + exec $DO_SENDMAIL $USER+trainham <$1 ;; esac |