From 92f748c1ca47cad2b120572c5d44402bc0c02af5 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 04:01:57 +0100
Subject: [PATCH 01/13] Rust now supports custom log dir

---
 Rust/rustserver | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Rust/rustserver b/Rust/rustserver
index 9557f914d..513f6b967 100644
--- a/Rust/rustserver
+++ b/Rust/rustserver
@@ -39,7 +39,7 @@ tickrate="30" # default 30; range : 15 to 100
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="-batchmode +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${servicename}\" ${conditionalseed} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile ${gamelogfile}"
+parms="-batchmode +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${servicename}\" ${conditionalseed} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile \"${gamelogdate}\""
 }
 
 # Specific to Rust
@@ -132,7 +132,6 @@ backupdir="${rootdir}/backups"
 gamelogdir="${rootdir}/log/server"
 scriptlogdir="${rootdir}/log/script"
 consolelogdir="${rootdir}/log/console"
-gamelog="${gamelogdir}/${servicename}-game.log"
 scriptlog="${scriptlogdir}/${servicename}-script.log"
 consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${scriptlogdir}/${servicename}-email.log"
@@ -140,7 +139,7 @@ emaillog="${scriptlogdir}/${servicename}-email.log"
 ## Logs Naming
 scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
-gamelogfile="\"gamelog-$(date '+%Y-%m-%d-%H-%M-%S').log\""
+gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log"
 
 ########################
 ######## Script ########

From 9d603d10ceb6a264826dd2359aa0152e8c33ee44 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 04:35:46 +0100
Subject: [PATCH 02/13] only rotate logs if server is off

Fixes #1318
---
 lgsm/functions/logs.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/logs.sh b/lgsm/functions/logs.sh
index ebcc8636a..ac2c3d771 100644
--- a/lgsm/functions/logs.sh
+++ b/lgsm/functions/logs.sh
@@ -16,7 +16,8 @@ if [ -n "${consolelog}" ]; then
 fi
 
 # For games not displaying a console, and having logs into their game directory
-if [ "${function_selfname}" == "command_start.sh" ] && [ -n "${gamelogfile}" ]; then
+check_status.sh
+if [ "${status}" != "0" ] && [ "${function_selfname}" == "command_start.sh" ] && [ -n "${gamelogfile}" ]; then
 	if [ -n "$(find "${systemdir}" -name "gamelog*.log")" ]; then
 		fn_print_info "Moving game logs to ${gamelogdir}"
 		fn_script_log_info "Moving game logs to ${gamelogdir}"

From 7a4438e8d0cc56cea90f7c0cccb3cf1a6b6dd6fa Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 04:40:22 +0100
Subject: [PATCH 03/13] sys permission fix only upon server start

fixes #1303
---
 lgsm/functions/check_permissions.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh
index d7bff4dee..24648f2ec 100644
--- a/lgsm/functions/check_permissions.sh
+++ b/lgsm/functions/check_permissions.sh
@@ -232,4 +232,6 @@ fn_sys_perm_error_process(){
 ## Run checks
 fn_check_ownership
 fn_check_permissions
-fn_sys_perm_error_process
+if [ "${function_selfname}" == "command_start.sh" ]; then
+	fn_sys_perm_error_process
+fi

From 2b4262e1d5e83f71f64f20a4caf0414b175b4b5d Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 04:55:16 +0100
Subject: [PATCH 04/13] Allow to run details with non-installed server

fixes #1302
---
 lgsm/functions/check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh
index 7cc1e9584..ec067de66 100644
--- a/lgsm/functions/check.sh
+++ b/lgsm/functions/check.sh
@@ -17,7 +17,7 @@ if [ "${function_selfname}" != "command_monitor.sh" ];then
 	check_permissions.sh
 fi
 
-if [ "${function_selfname}" != "command_install.sh" ]&&[ "${function_selfname}" != "command_update_functions.sh" ]; then
+if [ "${function_selfname}" != "command_install.sh" ]&&[ "${function_selfname}" != "command_update_functions.sh" ]&&[ "${function_selfname}" != "command_details.sh" ]&&[ "${function_selfname}" != "command_postdetails.sh" ]; then
 	check_system_dir.sh
 fi
 
@@ -53,7 +53,7 @@ do
 	fi
 done
 
-local allowed_commands_array=( command_console.sh command_debug.sh command_details.sh command_monitor.sh command_start.sh command_stop.sh )
+local allowed_commands_array=( command_console.sh command_debug.sh command_monitor.sh command_start.sh command_stop.sh )
 for allowed_command in "${allowed_commands_array[@]}"
 do
 	if [ "${allowed_command}" == "${function_selfname}" ]; then

From 15f80f1151699c38f884f9335acb7139b4e8af52 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 05:21:16 +0100
Subject: [PATCH 05/13] Run log manager upon update

fixes #1075
---
 lgsm/functions/command_update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh
index bc76a29b2..ad7b76aaf 100644
--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@@ -11,7 +11,7 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 fn_print_dots ""
 sleep 0.5
 check.sh
-
+logs.sh
 
 if [ "${gamename}" == "TeamSpeak 3" ]; then
 	update_ts3.sh

From 14141d4c8a2421b13207abda74f8c44e701d192c Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 05:27:01 +0100
Subject: [PATCH 06/13] Case where there is no console log

---
 lgsm/functions/update_steamcmd.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh
index 028f843ee..e500a0fbf 100644
--- a/lgsm/functions/update_steamcmd.sh
+++ b/lgsm/functions/update_steamcmd.sh
@@ -98,7 +98,11 @@ fn_update_request_log(){
 	fn_print_dots "Checking for update: Server logs"
 	fn_script_log_info "Checking for update: Server logs"
 	sleep 1
-	requestrestart=$(grep -Ec "MasterRequestRestart" "${consolelog}")
+	if [ -f ${consolelog} ]; then
+		requestrestart=$(grep -Ec "MasterRequestRestart" "${consolelog}")
+	else
+		requestrestart="0"
+	fi
 	if [ "${requestrestart}" -ge "1" ]; then
 		fn_print_ok_nl "Checking for update: Server logs: Update requested"
 		fn_script_log_pass "Checking for update: Server logs: Update requested"

From fadc79e84c1af3f0fec33a7a4b146c02cf5e3a71 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 06:18:25 +0100
Subject: [PATCH 07/13] Full path showed to the user

fixes #1288
---
 lgsm/functions/check_executable.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/check_executable.sh b/lgsm/functions/check_executable.sh
index 14ccdb060..cc90b435d 100644
--- a/lgsm/functions/check_executable.sh
+++ b/lgsm/functions/check_executable.sh
@@ -9,9 +9,10 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 # Check if executable exists
 if [ ! -f "${executabledir}/${execname}" ]; then
-	fn_script_log_warn "Expected executable not found: ${executabledir}/${execname}"
+	fn_script_log_warn "Executable was not found: ${executabledir}/${execname}"
 	if [ -d "${scriptlogdir}" ]; then
-		fn_print_fail_nl "Executable ${execname} was not found"
+		fn_print_fail_nl "Executable was not found:"
+		echo " * ${executabledir}/${execname}"
 	fi
 	exitcode="1"
 	core_exit.sh

From ab8ad9084c89c5871646b022d5fcf00a71aa8e7c Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 06:41:44 +0100
Subject: [PATCH 08/13] Only create dirs if they don't already exist

---
 lgsm/functions/install_logs.sh | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh
index 2019fdb13..0c3e69a4a 100644
--- a/lgsm/functions/install_logs.sh
+++ b/lgsm/functions/install_logs.sh
@@ -15,12 +15,22 @@ if [ "${checklogs}" != "1" ]; then
 fi
 sleep 1
 # Create dir's for the script and console logs
-mkdir -v "${rootdir}/log"
-mkdir -v "${scriptlogdir}"
-touch "${scriptlog}"
+if [ ! -d "${rootdir}/log" ]; then
+	mkdir -v "${rootdir}/log"
+fi
+if [ ! -d "${scriptlogdir}" ]; then
+	mkdir -v "${scriptlogdir}"
+fi
+if [ ! -f "${scriptlog}" ]; then
+	touch "${scriptlog}"
+fi
 if [ -n "${consolelogdir}" ]; then
-	mkdir -v "${consolelogdir}"
-	touch "${consolelog}"
+	if [ ! -d "${consolelogdir}" ]; then
+		mkdir -v "${consolelogdir}"
+	fi
+	if [ ! -f "${consolelog}" ]; then
+		touch "${consolelog}"
+	fi
 fi
 
 # If a server is source or goldsource, TeamSpeak 3, Starbound, Project Zomhoid create a symbolic link to the game server logs.
@@ -32,7 +42,9 @@ fi
 
 # If a server is unreal2 or unity3d create a dir.
 if [ "${engine}" == "unreal2" ]||[ "${engine}" == "unity3d" ]||[ "${gamename}" == "Teeworlds" ]||[ "${gamename}" == "seriousengine35" ]; then
-	mkdir -pv "${gamelogdir}"
+	if [ ! -d ${gamelogdir}" ]; then
+		mkdir -pv "${gamelogdir}"
+	fi
 fi
 
 # If server uses SteamCMD create a symbolic link to the Steam logs.
@@ -42,4 +54,4 @@ if [ -d "${rootdir}/Steam/logs" ]; then
 	fi
 fi
 sleep 1
-fn_script_log_info "Logs installed"
\ No newline at end of file
+fn_script_log_info "Logs installed"

From 6c6fd3a33c041fb35d24ae7f98f1feeeadf523b1 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 06:49:59 +0100
Subject: [PATCH 09/13] Create gamelogdir if variable exists & dir doesn't

---
 lgsm/functions/check_logs.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/check_logs.sh b/lgsm/functions/check_logs.sh
index 5e9da586c..d4fec4b1a 100644
--- a/lgsm/functions/check_logs.sh
+++ b/lgsm/functions/check_logs.sh
@@ -7,11 +7,20 @@
 local commandname="CHECK"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
-# Create directories for the script and console logs
-if [ ! -d "${scriptlogdir}" ]||[ ! -d "${consolelogdir}" ]&&[ "${gamename}" != "TeamSpeak 3" ]; then
+fn_check_logs(){
 	fn_print_dots "Checking for log files"
 	sleep 0.5
 	fn_print_info_nl "Checking for log files: Creating log files"
 	checklogs=1
 	install_logs.sh
+}
+
+# Create directories for the script and console logs
+if [ ! -d "${scriptlogdir}" ]||[ ! -d "${consolelogdir}" ]&&[ "${gamename}" != "TeamSpeak 3" ]; then
+	fn_check_logs
+fi
+
+# Create gamelogdir if variable exist but dir doesn't exist
+if [ -n "${gamelogdir}" ]&&[ ! -d "${gamelogdir}" ]; then
+	fn_check_logs
 fi

From 84016558b8df2f5225c7bd4292a78c0a6b4f2e54 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 06:51:09 +0100
Subject: [PATCH 10/13] double quote missing

---
 lgsm/functions/install_logs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh
index 0c3e69a4a..3f6020e45 100644
--- a/lgsm/functions/install_logs.sh
+++ b/lgsm/functions/install_logs.sh
@@ -42,7 +42,7 @@ fi
 
 # If a server is unreal2 or unity3d create a dir.
 if [ "${engine}" == "unreal2" ]||[ "${engine}" == "unity3d" ]||[ "${gamename}" == "Teeworlds" ]||[ "${gamename}" == "seriousengine35" ]; then
-	if [ ! -d ${gamelogdir}" ]; then
+	if [ ! -d "${gamelogdir}" ]; then
 		mkdir -pv "${gamelogdir}"
 	fi
 fi

From 7edf379b81fc26406cb8766abc6174b16b5f0dbb Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sun, 19 Feb 2017 06:56:19 +0100
Subject: [PATCH 11/13] Do not remove legacy logs if empty

---
 lgsm/functions/logs.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lgsm/functions/logs.sh b/lgsm/functions/logs.sh
index ac2c3d771..44467d82f 100644
--- a/lgsm/functions/logs.sh
+++ b/lgsm/functions/logs.sh
@@ -101,10 +101,6 @@ if [ $(find "${scriptlogdir}"/ -type f -mtime +"${logdays}"|wc -l) -ne "0" ]; th
 		find "${legacyserverlogdir}"/ -type f -mtime +"${logdays}"| tee >> "${scriptlog}"
 		legacycount=$(find "${legacyserverlogdir}"/ -type f -mtime +"${logdays}"|wc -l)
 		find "${legacyserverlogdir}"/ -mtime +"${logdays}" -type f -exec rm -f {} \;
-		# Remove directory if empty
-		if [ ! "$(ls -A "${legacyserverlogdir}")" ]; then
-		rm -rf "${legacyserverlogdir}"
-		fi
 	fi
 
 	# Count total amount of files removed

From 4155af5d60939f69ee6cfebcbae0dbe55ff22d52 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 19 Feb 2017 12:42:02 +0000
Subject: [PATCH 12/13] Reverting commit, no requirement to bypass this.

Rather than get no output mkdir message states that the directory already exists. This looks better than having nothing at all.
---
 lgsm/functions/install_logs.sh | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh
index 3f6020e45..2019fdb13 100644
--- a/lgsm/functions/install_logs.sh
+++ b/lgsm/functions/install_logs.sh
@@ -15,22 +15,12 @@ if [ "${checklogs}" != "1" ]; then
 fi
 sleep 1
 # Create dir's for the script and console logs
-if [ ! -d "${rootdir}/log" ]; then
-	mkdir -v "${rootdir}/log"
-fi
-if [ ! -d "${scriptlogdir}" ]; then
-	mkdir -v "${scriptlogdir}"
-fi
-if [ ! -f "${scriptlog}" ]; then
-	touch "${scriptlog}"
-fi
+mkdir -v "${rootdir}/log"
+mkdir -v "${scriptlogdir}"
+touch "${scriptlog}"
 if [ -n "${consolelogdir}" ]; then
-	if [ ! -d "${consolelogdir}" ]; then
-		mkdir -v "${consolelogdir}"
-	fi
-	if [ ! -f "${consolelog}" ]; then
-		touch "${consolelog}"
-	fi
+	mkdir -v "${consolelogdir}"
+	touch "${consolelog}"
 fi
 
 # If a server is source or goldsource, TeamSpeak 3, Starbound, Project Zomhoid create a symbolic link to the game server logs.
@@ -42,9 +32,7 @@ fi
 
 # If a server is unreal2 or unity3d create a dir.
 if [ "${engine}" == "unreal2" ]||[ "${engine}" == "unity3d" ]||[ "${gamename}" == "Teeworlds" ]||[ "${gamename}" == "seriousengine35" ]; then
-	if [ ! -d "${gamelogdir}" ]; then
-		mkdir -pv "${gamelogdir}"
-	fi
+	mkdir -pv "${gamelogdir}"
 fi
 
 # If server uses SteamCMD create a symbolic link to the Steam logs.
@@ -54,4 +42,4 @@ if [ -d "${rootdir}/Steam/logs" ]; then
 	fi
 fi
 sleep 1
-fn_script_log_info "Logs installed"
+fn_script_log_info "Logs installed"
\ No newline at end of file

From 70922d953a2d3cc36c3bb7c31f3275b884de4802 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 19 Feb 2017 12:44:54 +0000
Subject: [PATCH 13/13] comment

---
 lgsm/functions/check_logs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/check_logs.sh b/lgsm/functions/check_logs.sh
index d4fec4b1a..bc4f13bdf 100644
--- a/lgsm/functions/check_logs.sh
+++ b/lgsm/functions/check_logs.sh
@@ -20,7 +20,7 @@ if [ ! -d "${scriptlogdir}" ]||[ ! -d "${consolelogdir}" ]&&[ "${gamename}" != "
 	fn_check_logs
 fi
 
-# Create gamelogdir if variable exist but dir doesn't exist
+# Create gamelogdir if variable exist but dir does not exist
 if [ -n "${gamelogdir}" ]&&[ ! -d "${gamelogdir}" ]; then
 	fn_check_logs
 fi