From 176919c2c873d382d5fe8e2e6e533fc78ac5c13a Mon Sep 17 00:00:00 2001
From: jakubsuchybio <github@jakubsuchy.com>
Date: Wed, 1 Jun 2016 00:58:29 +0200
Subject: [PATCH] Add variable to set email's sender 'emailfrom'

---
 CounterStrikeGlobalOffensive/csgoserver |  5 +++--
 lgsm/functions/alert_email.sh           | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
index 940115c9c..359038ad0 100755
--- a/CounterStrikeGlobalOffensive/csgoserver
+++ b/CounterStrikeGlobalOffensive/csgoserver
@@ -19,8 +19,9 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
-# Pushbullet 
+# Pushbullet
 # https://www.pushbullet.com/#settings
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -147,7 +148,7 @@ if [ ! -f "${filedir}/${filename}" ]; then
 			exit 1
 		else
 			echo -e "\e[0;32mOK\e[0m"
-		fi		
+		fi
 	else
 		echo -e "\e[0;31mFAIL\e[0m\n"
 		echo "Curl is not installed!"
diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh
index c3f56b5ef..0a7acde47 100644
--- a/lgsm/functions/alert_email.sh
+++ b/lgsm/functions/alert_email.sh
@@ -28,7 +28,7 @@ fn_details_os(){
 	# Hostname:  hostname
 	# tmux:      tmux 1.8
 	# GLIBC:     2.19
-	
+
 	{
 		echo -e ""
 		echo -e "Distro Details"
@@ -56,7 +56,7 @@ fn_details_performance(){
 	{
 		echo -e ""
 		echo -e "Performance"
-		echo -e "================================="		
+		echo -e "================================="
 		echo -e "Uptime: ${days}d, ${hours}h, ${minutes}m"
 		echo -e "Avg Load: ${load}"
 		echo -e ""
@@ -124,7 +124,7 @@ fn_details_gameserver(){
 			echo -e "RCON password: ********"
 		fi
 
-		# Admin password 
+		# Admin password
 		if [ -n "${adminpassword}" ]; then
 			echo -e "Admin password: ********"
 		fi
@@ -172,7 +172,7 @@ fn_alert_email_template_logs(){
 	{
 	echo -e ""
 	echo -e "${servicename} Logs"
-	echo -e "================================="	
+	echo -e "================================="
 
 	if [ -n "${scriptlog}" ]; then
 		echo -e "\nScript log\n==================="
@@ -180,7 +180,7 @@ fn_alert_email_template_logs(){
 			echo "${scriptlogdir} (NO LOG FILES)"
 		elif [ ! -s "${scriptlog}" ]; then
 			echo "${scriptlog} (LOG FILE IS EMPTY)"
-		else	
+		else
 			echo "${scriptlog}"
 			tail -25 "${scriptlog}"
 		fi
@@ -193,7 +193,7 @@ fn_alert_email_template_logs(){
 			echo "${consolelogdir} (NO LOG FILES)"
 		elif [ ! -s "${consolelog}" ]; then
 			echo "${consolelog} (LOG FILE IS EMPTY)"
-		else	
+		else
 			echo "${consolelog}"
 			tail -25 "${consolelog}" | awk '{ sub("\r$", ""); print }'
 		fi
@@ -204,12 +204,12 @@ fn_alert_email_template_logs(){
 		echo -e "\nServer log\n==================="
 		if [ ! "$(ls -A ${gamelogdir})" ]; then
 			echo "${gamelogdir} (NO LOG FILES)"
-		else	
+		else
 			echo "${gamelogdir}"
 			tail "${gamelogdir}"/* | grep -v "==>" | sed '/^$/d' | tail -25
 		fi
 		echo ""
-	fi	
+	fi
 
 	} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}" > /dev/null 2>&1
 }
@@ -223,14 +223,18 @@ check_ip.sh
 emaillog="${emaillog}"
 if [ -f "${emaillog}" ]; then
 	rm "${emaillog}"
-fi	
+fi
 fn_details_email
 fn_details_os
 fn_details_performance
 fn_details_disk
 fn_details_gameserver
 fn_alert_email_template_logs
-mail -s "${alertsubject}" "${email}" < "${emaillog}"
+if [ -n "${emailfrom}" ]; then
+	mail -s "${alertsubject}" -a "From: ${emailfrom}" "${email}" < "${emaillog}"
+else
+	mail -s "${alertsubject}" "${email}" < "${emaillog}"
+fi
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then
 	fn_print_ok_nl "Sending alert to ${email}"