iankelling.org
/
git
/
log-quiet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: systemd has less environment vars
[log-quiet]
/
sysd-mail-once
diff --git
a/sysd-mail-once
b/sysd-mail-once
index 3542200d12d52b437362d252a3047315d34d0bd7..32aa02d2dbd5911c72656b1b5f39595acfc7c1d6 100755
(executable)
--- a/
sysd-mail-once
+++ b/
sysd-mail-once
@@
-18,7
+18,8
@@
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
errors=3
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
errors=3
-cbase=$HOME/sysd-mail-once-state
+tmp=(~)
+cbase="${tmp[0]}/sysd-mail-once-state"
to=root
dryrun=false
while [[ $1 == -* ]]; do
to=root
dryrun=false
while [[ $1 == -* ]]; do
@@
-142,7
+143,7
@@
if (( code )); then
echo "sysd-mail-once: emailing on $errors errors. exit code: $code"
mi exim -odf -t <<EOF
To: $to
echo "sysd-mail-once: emailing on $errors errors. exit code: $code"
mi exim -odf -t <<EOF
To: $to
-From: $
USER
@$(hostname -f)
+From: $
(id -u -n)
@$(hostname -f)
Subject: $HOSTNAME: $service exit code: $code
$(journalctl -u $service.service --after-cursor="$(<$file)")
Subject: $HOSTNAME: $service exit code: $code
$(journalctl -u $service.service --after-cursor="$(<$file)")
@@
-155,7
+156,7
@@
else
echo "sysd-mail-once: emailing success after >= $errors errors."
mi exim -odf -t <<EOF
To: $to
echo "sysd-mail-once: emailing success after >= $errors errors."
mi exim -odf -t <<EOF
To: $to
-From: $
USER
@$(hostname -f)
+From: $
(id -u -n)
@$(hostname -f)
Subject: $HOSTNAME: $service success
EOF
Subject: $HOSTNAME: $service success
EOF