rewording variables

lgsm/functions/alert.sh

@@ -27,11 +27,11 @@ fn_alert_log(){
 
 fn_alert_test(){
 	fn_script_log_info "Sending test alert"
-	alertsubject="Alert - ${selfname} - Test"
+	alerttitle="Alert - ${selfname} - Test"
 	alertemoji="🚧"
 	alertsound="1"
 	alerturl="not enabled"
-	alertdescription="Testing LinuxGSM Alert. No action to be taken."
+	alertmessage="Testing LinuxGSM Alert. No action to be taken."
 	# Green
 	alertcolourhex="#cdcd00"
 	alertcolourdec="13487360"
@@ -39,11 +39,11 @@ fn_alert_test(){
 
 fn_alert_restart(){
 	fn_script_log_info "Sending alert: Restarted: ${selfname}, ${executable} is not running"
-	alertsubject="Alert - ${selfname} - Restarted"
+	alerttitle="Alert - ${selfname} - Restarted"
 	alertemoji="🚨"
 	alertsound="2"
 	alerturl="not enabled"
-	alertdescription="${selfname} is not running. Game Server has been restarted."
+	alertmessage="${selfname} is not running. Game Server has been restarted."
 	# Red
 	alertcolourhex="#cd0000"
 	alertcolourdec="13434880"
@@ -51,11 +51,11 @@ fn_alert_restart(){
 
 fn_alert_restart_query(){
 	fn_script_log_info "Sending alert: Restarted: ${selfname}"
-	alertsubject="Alert - ${selfname} - Restarted"
+	alerttitle="Alert - ${selfname} - Restarted"
 	alertemoji="🚨"
 	alertsound="2"
 	alerturl="not enabled"
-	alertdescription="Unable to query ${selfname}. Game server has been restarted"
+	alertmessage="Unable to query ${selfname}. Game server has been restarted"
 	# Red
 	alertcolourhex="#cd0000"
 	alertcolourdec="13434880"
@@ -63,11 +63,11 @@ fn_alert_restart_query(){
 
 fn_alert_update(){
 	fn_script_log_info "Sending alert: Updated: ${selfname}"
-	alertsubject="Alert - ${selfname} - Updated"
+	alerttitle="Alert - ${selfname} - Updated"
 	alertemoji="🎮"
 	alertsound="1"
 	alerturl="not enabled"
-	alertdescription="${selfname} has received an update"
+	alertmessage="${selfname} has received an update"
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"
@@ -75,11 +75,11 @@ fn_alert_update(){
 
 fn_alert_check_update(){
 	fn_script_log_info "Sending alert: Update available"
-	alertsubject="Alert - ${selfname} - Update available"
+	alerttitle="Alert - ${selfname} - Update available"
 	alertemoji="🎮"
 	alertsound="1"
 	alerturl="not enabled"
-	alertdescription="Update availablefor ${selfname}"
+	alertmessage="Update availablefor ${selfname}"
 	# Blue
 	alertcolourhex="#1e90ff"
 	alertcolourdec="2003199"
@@ -87,11 +87,11 @@ fn_alert_check_update(){
 
 fn_alert_permissions(){
 	fn_script_log_info "Sending alert: Permissions error"
-	alertsubject="Alert - ${selfname}: Permissions error"
+	alerttitle="Alert - ${selfname}: Permissions error"
 	alertemoji="❗"
 	alertsound="2"
 	alerturl="not enabled"
-	alertdescription="${selfname} has permissions issues"
+	alertmessage="${selfname} has permissions issues"
 	# Red
 	alertcolourhex="#cd0000"
 	alertcolourdec="13434880"
@@ -99,11 +99,11 @@ fn_alert_permissions(){
 
 fn_alert_config(){
 	fn_script_log_info "Sending alert: New _default.cfg"
-	alertsubject="Alert - ${selfname} - New _default.cfg"
+	alerttitle="Alert - ${selfname} - New _default.cfg"
 	alertemoji="📄"
 	alertsound="1"
 	alerturl="not enabled"
-	alertdescription="${selfname} has received a new _default.cfg. Check file for changes."
+	alertmessage="${selfname} has received a new _default.cfg. Check file for changes."
 	# Blue
 	alertcolourhex="#1e90ff"
 	alertcolourdec="2003199"
@@ -111,11 +111,11 @@ fn_alert_config(){
 
 fn_alert_wipe(){
 	fn_script_log_info "Sending alert: Wiped: ${selfname} wiped"
-	alertsubject="Alert - ${selfname} - Wiped"
+	alerttitle="Alert - ${selfname} - Wiped"
 	alertemoji="💿"
 	alertsound="1"
 	alerturl="not enabled"
-	alertdescription="${selfname} as been wiped."
+	alertmessage="${selfname} as been wiped."
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"

lgsm/functions/alert_discord.sh

@@ -21,7 +21,7 @@ json=$(cat <<EOF
 			},
 			"title": "${servername}",
 			"url": "",
-			"description": "${alertemoji} ${alertsubject} ${alertemoji}",
+			"description": "${alertemoji} ${alerttitle} ${alertemoji}",
 			"color": "${alertcolourdec}",
 			"fields": [
 				{
@@ -56,7 +56,7 @@ json=$(cat <<EOF
 				},
 				{
 					"name": "Information",
-					"value": "${alertdescription} \n More info: ${alerturl}"
+					"value": "${alertmessage} \n More info: ${alerturl}"
 				}
 			],
 			"thumbnail": {

lgsm/functions/alert_email.sh

@@ -11,9 +11,9 @@ fn_print_dots "Sending Email alert: ${email}"
 fn_sleep_time
 
 if [ -n "${emailfrom}" ]; then
-	mail -s "${alertsubject}" -r "${emailfrom}" "${email}" < "${alertlog}"
+	mail -s "${alerttitle}" -r "${emailfrom}" "${email}" < "${alertlog}"
 else
-	mail -s "${alertsubject}" "${email}" < "${alertlog}"
+	mail -s "${alerttitle}" "${email}" < "${alertlog}"
 fi
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then

lgsm/functions/alert_gotify.sh

@@ -9,8 +9,8 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 json=$(cat <<EOF
 {
-	"title": "${alertemoji} ${alertsubject} ${alertemoji}",
+	"title": "${alertemoji} ${alerttitle} ${alertemoji}",
-	"message": "Server name\n${servername}\n\nMessage\n${alertdescription}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}",
+	"message": "Server name\n${servername}\n\nMessage\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}",
 	"priority": 5
 }
 EOF

lgsm/functions/alert_ifttt.sh

@@ -10,8 +10,8 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 json=$(cat <<EOF
 {
 	"value1": "${selfname}",
-	"value2": "${alertemoji} ${alertsubject} ${alertemoji}",
+	"value2": "${alertemoji} ${alerttitle} ${alertemoji}",
-	"value3": "Server name<br>${servername}<br><br>Information<br>${alertdescription}<br><br>Game<br>${gamename}<br><br>${alertplayerstitle}<br>${alertplayers}<br><br>Map<br>${alertmap}<br><br>Server IP<br>${alertip}:${port}<br><br>Hostname<br>${HOSTNAME}<br><br>More info<br>${alerturl}"
+	"value3": "Server name<br>${servername}<br><br>Message<br>${alertmessage}<br><br>Game<br>${gamename}<br><br>${alertplayerstitle}<br>${alertplayers}<br><br>Map<br>${alertmap}<br><br>Server IP<br>${alertip}:${port}<br><br>Hostname<br>${HOSTNAME}<br><br>More info<br>${alerturl}"
 }
 EOF
 )

lgsm/functions/alert_mailgun.sh

@@ -18,7 +18,7 @@ fn_print_dots "Sending Email alert: Mailgun: ${email}"
 mailgunsend=$(curl --connect-timeout 10 -s --user "api:${mailguntoken}" \
 -F from="LinuxGSM <${mailgunemailfrom}>" \
 -F to="LinuxGSM Admin <${mailgunemail}>" \
--F subject="${alertemoji} ${alertsubject} ${alertemoji}" \
+-F subject="${alertemoji} ${alerttitle} ${alertemoji}" \
 -F o:tag='alert' \
 -F o:tag='LinuxGSM' \
 -F text="$(cat "${alertlog}")" "${mailgunapiurl}/v3/${mailgundomain}/messages")

lgsm/functions/alert_pushbullet.sh

@@ -11,8 +11,8 @@ json=$(cat <<EOF
 {
 	"channel_tag": "${channeltag}",
 	"type": "note",
-	"title": "${alertemoji} ${alertsubject} ${alertemoji}",
+	"title": "${alertemoji} ${alerttitle} ${alertemoji}",
-	"body": "Server name\n${servername}\n\nInformation\n${alertdescription}\n\nGame\n${gamename}\n\n${alertplayerstitle}\n${alertplayers}\n\nMap\n${alertmap}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}"
+	"body": "Server name\n${servername}\n\nMessage\n${alertmessage}\n\nGame\n${gamename}\n\n${alertplayerstitle}\n${alertplayers}\n\nMap\n${alertmap}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}"
 }
 EOF
 )

lgsm/functions/alert_pushover.sh

@@ -22,7 +22,7 @@ else
 	alertpriority="0"
 fi
 
-pushoversend=$(curl --connect-timeout 10 -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Server name</b><br>${servername}<br><br><b>Message</b><br>${alertdescription}<br><br><b>Game</b><br>${gamename}<br><br><b>${alertplayerstitle}</b><br>${alertplayers}<br><br><b>Map</b><br>${alertmap}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
+pushoversend=$(curl --connect-timeout 10 -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alerttitle} ${alertemoji}" -F message=" <b>Server name</b><br>${servername}<br><br><b>Message</b><br>${alertmessage}<br><br><b>Game</b><br>${gamename}<br><br><b>${alertplayerstitle}</b><br>${alertplayers}<br><br><b>Map</b><br>${alertmap}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
 
 if [ -n "${pushoversend}" ]; then
 	fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"

lgsm/functions/alert_rocketchat.sh

@@ -10,7 +10,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 json=$(cat <<EOF
 {
 	"alias": "LinuxGSM",
-	"text": "*${alertemoji} ${alertsubject} ${alertemoji}* \n *${servername}* \n ${alertdescription} \n More info: ${alerturl}",
+	"text": "*${alertemoji} ${alerttitle} ${alertemoji}* \n *${servername}* \n ${alertmessage} \n More info: ${alerturl}",
 	"attachments": [
 		{
 			"fields": [

lgsm/functions/alert_slack.sh

@@ -36,7 +36,7 @@ json=$(cat <<EOF
 			"type": "section",
 			"text": {
 				"type": "mrkdwn",
-				"text": "*${alertemoji} ${alertsubject}* \n ${alertdescription}"
+				"text": "*${alertemoji} ${alerttitle}* \n ${alertmessage}"
 			}
 		},
 		{
@@ -92,7 +92,7 @@ json=$(cat <<EOF
 			"type": "section",
 			"text": {
 				"type": "mrkdwn",
-				"text": "*Information*\n${alertdescription} \n More info: ${alerturl}"
+				"text": "*Message*\n${alertmessage} \n More info: ${alerturl}"
 			}
 		},
 		{

lgsm/functions/alert_telegram.sh

@@ -11,7 +11,7 @@ json=$(cat <<EOF
 {
 	"chat_id": "${telegramchatid}",
 	"parse_mode": "HTML",
-	"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertdescription}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
+	"text": "<b>${alertemoji} ${alerttitle} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertmessage}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
 	"disable_web_page_preview": "yes",
 EOF
 )

lgsm/functions/info_messages.sh

@@ -60,7 +60,7 @@ fn_info_message_head(){
 	echo -e "${lightyellow}Alert Summary${default}"
 	fn_messages_separator
 	echo -e "Message"
-	echo -e "${alertdescription}"
+	echo -e "${alertmessage}"
 	echo -e ""
 	echo -e "Game"
 	echo -e "${gamename}"