Przeglądaj źródła

Change logfile used for update check

This changes the logfile that is used from the log generated by tmux to the log generated by the factorio binary. As logging is disabled in tmux 1.8, those users which may be stuck on that version cannot use the update functionality, as there is no log to go off of.
Terry Wrist 8 lat temu
rodzic
commit
34d5576841
1 zmienionych plików z 4 dodań i 4 usunięć
  1. 4 4
      lgsm/functions/update_factorio.sh

+ 4 - 4
lgsm/functions/update_factorio.sh

@@ -26,7 +26,7 @@ fn_update_factorio_dl(){
 fn_update_factorio_currentbuild(){
 fn_update_factorio_currentbuild(){
 	# Gets current build info
 	# Gets current build info
 	# Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
 	# Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
-	if [ ! -f "${consolelogdir}/${servicename}-console.log" ]; then
+	if [ ! -f "${logdir}/server/factorio-current.log" ]; then
 		fn_print_error "Checking for update: factorio.com"
 		fn_print_error "Checking for update: factorio.com"
 		sleep 1
 		sleep 1
 		fn_print_error_nl "Checking for update: factorio.com: No logs with server version found"
 		fn_print_error_nl "Checking for update: factorio.com: No logs with server version found"
@@ -41,7 +41,7 @@ fn_update_factorio_currentbuild(){
 		command_start.sh
 		command_start.sh
 		sleep 1
 		sleep 1
 		# Check again and exit on failure.
 		# Check again and exit on failure.
-		if [ ! -f "${consolelogdir}/${servicename}-console.log" ]; then
+		if [ ! -f "${logdir}/server/factorio-current.log" ]; then
 			fn_print_fail_nl "Checking for update: factorio.com: Still No logs with server version found"
 			fn_print_fail_nl "Checking for update: factorio.com: Still No logs with server version found"
 			fn_script_log_fatal "Checking for update: factorio.com: Still No logs with server version found"
 			fn_script_log_fatal "Checking for update: factorio.com: Still No logs with server version found"
 			core_exit.sh
 			core_exit.sh
@@ -49,7 +49,7 @@ fn_update_factorio_currentbuild(){
 	fi
 	fi
 
 
 	# Get current build from logs
 	# Get current build from logs
-	currentbuild=$(grep "Loading mod base" "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null|awk '{print $5}'|tail -1)
+	currentbuild=$(grep "Loading mod base" "${logdir}"/server/factorio-current.log 2> /dev/null|awk '{print $5}'|tail -1)
 	if [ -z "${currentbuild}" ]; then
 	if [ -z "${currentbuild}" ]; then
 		fn_print_error_nl "Checking for update: factorio.com: Current build version not found"
 		fn_print_error_nl "Checking for update: factorio.com: Current build version not found"
 		fn_script_log_error "Checking for update: factorio.com: Current build version not found"
 		fn_script_log_error "Checking for update: factorio.com: Current build version not found"
@@ -60,7 +60,7 @@ fn_update_factorio_currentbuild(){
 		command_stop.sh
 		command_stop.sh
 		exitbypass=1
 		exitbypass=1
 		command_start.sh
 		command_start.sh
-		currentbuild=$(grep "Loading mod base" "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null|awk '{print $5}'|tail -1)
+		currentbuild=$(grep "Loading mod base" "${logdir}"/server/factorio-current.log 2> /dev/null|awk '{print $5}'|tail -1)
 		if [ -z "${currentbuild}" ]; then
 		if [ -z "${currentbuild}" ]; then
 			fn_print_fail_nl "Checking for update: factorio.com: Current build version still not found"
 			fn_print_fail_nl "Checking for update: factorio.com: Current build version still not found"
 			fn_script_log_fatal "Checking for update: factorio.com: Current build version still not found"
 			fn_script_log_fatal "Checking for update: factorio.com: Current build version still not found"