From 583642945b81620bf1389c2454f621946412d016 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 5 Sep 2018 18:44:53 +0200
Subject: [PATCH] use "who -m" to simplify information gathering

---
 evomaintenance.sh | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/evomaintenance.sh b/evomaintenance.sh
index b162e6a..5096665 100644
--- a/evomaintenance.sh
+++ b/evomaintenance.sh
@@ -13,25 +13,13 @@ test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
 [ -n "${EVOMAINTMAIL}" ] || EVOMAINTMAIL=evomaintenance-$(echo "${HOSTNAME}" | cut -d- -f1)@${REALM}
 [ -n "${LOGFILE}" ]      || LOGFILE=/var/log/evomaintenance.log
 
-SYSTEME=$(uname -s)
+PATH=${PATH}:/usr/sbin
 
-if [ "${SYSTEME}" = "Linux" ]; then
-    USER_TTY=$(tty | cut -d"/" -f3,4,5)
-    LOGFILE_PERMS="root:adm"
-elif [ "${SYSTEME}" = "OpenBSD" ]; then
-    USER_TTY=$(tty | cut -d"/" -f3)
-    LOGFILE_PERMS="root:wheel"
-else
-    echo "OS not detected!"
-    exit 1
-fi
-
-USER=$(logname)
-WHO=$(LC_ALL=C who | grep ${USER_TTY} | tr -s ' ')
+WHO=$(LC_ALL=C who -m)
+USER=$(echo ${WHO} | cut -d" " -f1)
 IP=$(echo ${WHO} | cut -d" " -f6  | sed -e "s/^(// ; s/)$//")
 BEGIN_DATE=$(echo ${WHO} | cut -d" " -f3,4,5)
 BEGIN_YEAR=$(date "+%Y")
-PATH=${PATH}:/usr/sbin
 
 # end_date
 NOW=$(date -u +"%Y-%m-%dT%H:%M:%SZ")