Merge branch 'hotfix/170619' into develop

README.md

@@ -1,5 +1,6 @@
 <a href="https://gameservermanagers.com"><img src="https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/images/logo/lgsm-light-full.png" alt="linux Game Server Managers" width="600" /></a>
 
+[![LinuxGSM](https://github.com/GameServerManagers/LinuxGSM/blob/master/images/logo/lgsmbutton.png)](https://linuxgsm.com)
 [![Build Status](https://travis-ci.org/GameServerManagers/LinuxGSM.svg?branch=master)](https://travis-ci.org/GameServerManagers/LinuxGSM)
 [![Under Development](https://badge.waffle.io/GameServerManagers/LinuxGSM.svg?label=Under%20Development&title=Under%20Development)](http://waffle.io/GameServerManagers/LinuxGSM)
 [![Discord](https://discordapp.com/api/guilds/127498813903601664/widget.png?style=shield)](https://gameservermanagers.com/discord)

lgsm/config-default/config-lgsm/arkserver/_default.cfg

@@ -34,10 +34,6 @@ pushbulletalert="off"
 pushbullettoken="accesstoken"
 channeltag=""
 
-# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord
-discordalert="off"
-discordwebhook="https://discordapp.com/api/webhooks/12345/abcd12345"
-
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update
 updateonstart="off"
 

lgsm/config-default/config-lgsm/rustserver/_default.cfg

@@ -42,10 +42,6 @@ fi
 ## Notification Alerts
 # (on|off)
 
-# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord
-discordalert="off"
-discordwebhook="https://discordapp.com/api/webhooks/12345/abcd12345"
-
 # Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email
 emailalert="off"
 email="[email protected]"

lgsm/functions/check_ip.sh

@@ -39,7 +39,11 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi
 			echo -en "https://gameservermanagers.com/network-interfaces\n"
 			echo -en ""
 			fn_script_log_fatal "Multiple active network interfaces found."
-			fn_script_log_fatal "Manually specify the IP you want to use within the ${selfname} script."
+			if [ "${legacymode}" == "1" ] then
+				fn_script_log_fatal "Manually specify the IP you want to use within the ${selfname} script."
+			else
+				fn_script_log_fatal "Manually specify the IP you want to use within: ${configdirserver}."
+			fi
 			fn_script_log_fatal "https://gameservermanagers.com/network-interfaces\n"
 			core_exit.sh
 		else

lgsm/functions/check_steamcmd.sh

@@ -18,10 +18,17 @@ fn_install_steamcmd(){
 fn_check_steamcmd_user(){
 	# Checks if steamuser is setup.
 	if [ "${steamuser}" == "username" ]; then
-		fn_print_fail_nl "Steam login not set. Update steamuser in ${selfname}"
+		if [ "${legacymode}" == "1" ] then
+			fn_print_fail_nl "Steam login not set. Update steamuser in ${selfname}"
+		else
+			fn_print_fail_nl "Steam login not set. Update steamuser in ${configdirserver}"
+		fi
 		echo "	* Change steamuser=\"username\" to a valid steam login."
 		if [ -d "${lgsmlogdir}" ]; then
-			fn_script_log_fatal "Steam login not set. Update steamuser in ${selfname}"
+			if [ "${legacymode}" == "1" ] then
+				fn_script_log_fatal "Steam login not set. Update steamuser in ${selfname}"
+			else
+				fn_script_log_fatal "Steam login not set. Update steamuser in ${configdirserver}"
 		fi
 		core_exit.sh
 	fi

lgsm/functions/command_console.sh

@@ -10,10 +10,10 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 check.sh
 fn_print_header
-if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]; then
+if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]||[ "${gamename}" == "ARK: Survival Evolved" ]; then
 	fn_print_information_nl "${gamename} does not produce a verbose output to the console"
 fi
-if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]; then
+if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]||[ "${gamename}" == "ARK: Survival Evolved" ]; then
 	fn_print_information_nl "${gamename} does not allow server commands to be entered in to the console"
 fi
 fn_print_information_nl "Press \"CTRL+b\" then \"d\" to exit console."

linuxgsm.sh

@@ -8,6 +8,10 @@
 # Website: https://gameservermanagers.com
 
 # DO NOT EDIT THIS FILE
+# LinuxGSM configuration is no longer edited here
+# To update your LinuxGSM config go to:
+# lgsm/config-lgsm
+# https://github.com/GameServerManagers/LinuxGSM/wiki/LinuxGSM-Config-Files
 
 # Debugging
 if [ -f ".dev-debug" ]; then