diff options
| author | Jonathan Bauer | 2016-07-15 13:33:31 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-07-15 13:33:31 +0200 |
| commit | e95317dc5caf6907f1b8d8a900320480dc3ab17e (patch) | |
| tree | 3e865f54c5a34724bd1a79fd8b1d062c48f5999d /remote/modules/cron/data/opt/openslx/scripts/cron-sendmail | |
| parent | [dnbd3] fix missing dependency on fusermount for dnbd3-fuse (diff) | |
| parent | Update several calls to slxlog with --delete instead of having sleep + rm fol... (diff) | |
| download | tm-scripts-e95317dc5caf6907f1b8d8a900320480dc3ab17e.tar.gz tm-scripts-e95317dc5caf6907f1b8d8a900320480dc3ab17e.tar.xz tm-scripts-e95317dc5caf6907f1b8d8a900320480dc3ab17e.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/cron/data/opt/openslx/scripts/cron-sendmail')
| -rwxr-xr-x | remote/modules/cron/data/opt/openslx/scripts/cron-sendmail | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail b/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail index 3ce2a19d..f46c226d 100755 --- a/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail +++ b/remote/modules/cron/data/opt/openslx/scripts/cron-sendmail @@ -10,16 +10,14 @@ if [ "x$SLX_CRON_MAIL" = "xslxlog" ]; then SUBJ=$(grep '^Subject: .*$' "$TMP" | cut -c 10-) if [ -n "$SUBJ" ]; then - slxlog "cron" "$SUBJ" "$TMP" + slxlog --delete "cron" "$SUBJ" "$TMP" fi - - rm -f -- "$TMP" elif [ -n "$SLX_CRON_MAIL" ] && [ -x "$SLX_CRON_MAIL" ]; then # see if SLX_CRON_MAIL is a valid binary and use that - $SLX_CRON_MAIL $@ + $SLX_CRON_MAIL "$@" elif which sendmail 2> /dev/null; then # fallback to sendmail - sendmail $@ + sendmail "$@" elif which logger 2> /dev/null; then # nothing worked, write to syslog if logger is present TMP=$(mktemp /tmp/cron.XXXXXXXX) |