Merge branch 'master' into develop

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

@@ -13,6 +13,7 @@ ip="0.0.0.0"
 port="34197"
 rconport="34198"
 rconpassword="CHANGE_ME"
+branch="stable"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
@@ -77,4 +78,4 @@ emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

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

@@ -59,10 +59,10 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${serverfiles}/Logs"
-scriptlogdir="${logdir}/script"
-scriptlog="${scriptlogdir}/${servicename}-script.log"
-emaillog="${scriptlogdir}/${servicename}-email.log"
+gamelogdir="${serverfiles}/logs"
+lgsmlogdir="${logdir}/script"
+lgsmlog="${lgsmlogdir}/${servicename}-script.log"
+emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"

lgsm/functions/check_ip.sh

@@ -39,7 +39,7 @@ 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."
-			if [ "${legacymode}" == "1" ] then
+			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}."

lgsm/functions/check_steamcmd.sh

@@ -18,17 +18,18 @@ fn_install_steamcmd(){
 fn_check_steamcmd_user(){
 	# Checks if steamuser is setup.
 	if [ "${steamuser}" == "username" ]; then
-		if [ "${legacymode}" == "1" ] then
+		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
-			if [ "${legacymode}" == "1" ] then
+			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
 		fi
 		core_exit.sh
 	fi
@@ -62,4 +63,4 @@ fn_check_steamcmd_sh(){
 }
 
 fn_check_steamcmd_user
-fn_check_steamcmd_sh
+fn_check_steamcmd_sh