X-Git-Url: https://iankelling.org/git/?p=log-quiet;a=blobdiff_plain;f=sysd-mail-once;fp=sysd-mail-once;h=32aa02d2dbd5911c72656b1b5f39595acfc7c1d6;hp=3542200d12d52b437362d252a3047315d34d0bd7;hb=5f298276149342f9e2ddf3315355630d205a0456;hpb=8d7f4d77c6eab1163da3dd9bd89c96038cbd158e

diff --git a/sysd-mail-once b/sysd-mail-once
index 3542200..32aa02d 100755
--- 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
-cbase=$HOME/sysd-mail-once-state
+tmp=(~)
+cbase="${tmp[0]}/sysd-mail-once-state"
 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
-From: $USER@$(hostname -f)
+From: $(id -u -n)@$(hostname -f)
 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
-From: $USER@$(hostname -f)
+From: $(id -u -n)@$(hostname -f)
 Subject: $HOSTNAME: $service success
 
 EOF