Merge branch 'develop' into master

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

@@ -103,5 +103,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/bf1942server/_default.cfg

@@ -82,5 +82,5 @@ consolelog="${consolelogdir}/${servicename}-console.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"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

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

@@ -103,5 +103,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/boserver/_default.cfg

@@ -93,5 +93,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/bsserver/_default.cfg

@@ -102,5 +102,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/ccserver/_default.cfg

@@ -98,5 +98,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/cod2server/_default.cfg

@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -82,5 +82,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/cod4server/_default.cfg

@@ -16,7 +16,7 @@ maxplayers="32"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -82,5 +82,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/codserver/_default.cfg

@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -82,5 +82,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/coduoserver/_default.cfg

@@ -82,5 +82,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/codwawserver/_default.cfg

@@ -16,7 +16,7 @@ maxplayers="20"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -82,5 +82,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/coserver/_default.cfg

@@ -126,5 +126,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/csserver/_default.cfg

@@ -95,5 +95,5 @@ consolelog="${consolelogdir}/${servicename}-console.log"
 emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
-lgsmlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(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/doiserver/_default.cfg

@@ -90,7 +90,6 @@ backupdir="${rootdir}/backups"
 ## Logging Directories
 logdir="${rootdir}/log"
 gamelogdir="${systemdir}/logs"
-scriptlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
 consolelog="${consolelogdir}/${servicename}-console.log"

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

@@ -26,7 +26,7 @@ allowjoininprogress="true"
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 # Edit with care | List of game types and mutators : http://wiki.unrealadmin.org/FAQ:UT3
 fn_parms(){
-parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?MaxPlayers=${maxplayers}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}""
+parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?MaxPlayers=${maxplayers}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}"
 }
 
 #### LinuxGSM Settings ####

lgsm/functions/command_wipe.sh

@@ -43,9 +43,10 @@ fn_wipe_exit_code(){
 # Removes files to wipe server
 fn_wipe_server_remove_files(){
 	# Rust Wipe
+#WipeProceduralSave
 	if [ "${gamename}" == "Rust" ]; then
 		if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then
-			currentaction="Removing map save(s): ${serveridentitydir}/proceduralmap.*.sav"
+			currentaction="Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav"
 			echo -en "Removing map saves proceduralmap.*.sav file(s)..."
 			sleep 1
 			fn_script_log "${currentaction}"
@@ -53,21 +54,50 @@ fn_wipe_server_remove_files(){
 			fn_wipe_exit_code
 			sleep 0.5
 		else
-			fn_print_information_nl "No map save to remove"
-			fn_script_log_info "No map save to remove."
+			fn_print_information_nl "No procedural map save to remove"
+			fn_script_log_info "No procedural map save to remove."
 			sleep 0.5
 		fi
+#WipeBarrenSave
+			if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then
+			currentaction="Removing barren map save(s): ${serveridentitydir}/barren*.sav"
+			echo -en "Removing barren map saves barren*.sav file(s)..."
+			sleep 1
+			fn_script_log "${currentaction}"
+			find "${serveridentitydir:?}" -type f -name "barren*.sav" -delete
+			fn_wipe_exit_code
+			sleep 0.5
+		else
+			fn_print_information_nl "No barren map save to remove"
+			fn_script_log_info "No barren map save to remove."
+			sleep 0.5
+		fi
+#WipeProceduralMap
 		if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then
 			currentaction="Removing map file(s): ${serveridentitydir}/proceduralmap.*.map"
-			echo -en "Removing map proceduralmap.*.map file(s)..."
+			echo -en "Removing procedural map proceduralmap.*.map file(s)..."
 			sleep 1
 			fn_script_log "${currentaction}"
 			find "${serveridentitydir:?}" -type f -name "proceduralmap.*.map" -delete
 			fn_wipe_exit_code
 			sleep 0.5
 		else
-			fn_print_information_nl "No map file to remove"
-			fn_script_log_info "No map file to remove."
+			fn_print_information_nl "No procedural map file to remove"
+			fn_script_log_info "No procedural map file to remove."
+			sleep 0.5
+		fi
+#WipeBarrenMap
+				if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then
+			currentaction="Removing map file(s): ${serveridentitydir}/barren*.map"
+			echo -en "Removing barren map barren*.map file(s)..."
+			sleep 1
+			fn_script_log "${currentaction}"
+			find "${serveridentitydir:?}" -type f -name "barren*.map" -delete
+			fn_wipe_exit_code
+			sleep 0.5
+		else
+			fn_print_information_nl "No barren map file to remove"
+			fn_script_log_info "No barren map file to remove."
 			sleep 0.5
 		fi
 		if [ -d "${serveridentitydir}/user" ]; then
@@ -116,7 +146,7 @@ fn_wipe_server_remove_files(){
 # Check if there is something to wipe, prompt the user, and call appropriate functions
 # Rust Wipe
 if [ "${gamename}" == "Rust" ]; then
-	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then
+	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then
 		fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased."
 		if ! fn_prompt_yn "Continue?" Y; then
 				echo Exiting; core_exit.sh

lgsm/functions/core_legacy.sh

@@ -21,10 +21,6 @@ if [ -z "${lgsmlog}" ]; then
 	lgsmlog="${scriptlog}"
 fi
 
-if [ -z "${lgsmlogdir}" ]; then
-	lgsmlogdir="${scriptlogdir}"
-fi
-
 if [ -z "${lgsmlogdate}" ]; then
 	lgsmlogdate="${scriptlogdate}"
 fi

lgsm/functions/update_factorio.sh

@@ -26,7 +26,7 @@ fn_update_factorio_dl(){
 fn_update_factorio_currentbuild(){
 	# Gets current build info
 	# 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"
 		sleep 1
 		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
 		sleep 1
 		# 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_script_log_fatal "Checking for update: factorio.com: Still No logs with server version found"
 			core_exit.sh
@@ -49,7 +49,7 @@ fn_update_factorio_currentbuild(){
 	fi
 
 	# 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
 		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"
@@ -60,7 +60,7 @@ fn_update_factorio_currentbuild(){
 		command_stop.sh
 		exitbypass=1
 		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
 			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"

lgsm/functions/update_mta.sh

@@ -9,64 +9,64 @@ local commandaction="Update"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_update_mta_dl(){
-        fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz"
-  mkdir "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
-        fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
-        echo -e "copying to ${filesdir}...\c"
-        fn_script_log "Copying to ${filesdir}"
-        cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${filesdir}"
-        local exitcode=$?
-        if [ "${exitcode}" == "0" ]; then
-                fn_print_ok_eol_nl
-        else
-                fn_print_fail_eol_nl
-        fi
+	fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz"
+	mkdir "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
+	fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}/multitheftauto_linux_x64-${fullversion}"
+	echo -e "copying to ${serverfiles}...\c"
+	fn_script_log "Copying to ${serverfiles}"
+	cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${serverfiles}"
+	local exitcode=$?
+	if [ "${exitcode}" == "0" ]; then
+		fn_print_ok_eol_nl
+	else
+		fn_print_fail_eol_nl
+	fi
 }
 
 fn_update_mta_currentbuild(){
-        # Gets current build info
-        # Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
-        if [ ! -f "${gamelogdir}"/server.log ]; then
-                fn_print_error "Checking for update: linux.mtasa.com"
-                sleep 1
-                fn_print_error_nl "Checking for update: linux.mtasa.com: No logs with server version found"
-                fn_script_log_error "Checking for update: linux.mtasa.com: No logs with server version found"
-                sleep 1
-                fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
-                fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
-                sleep 1
-                exitbypass=1
-                command_stop.sh
-                exitbypass=1
-                command_start.sh
-                sleep 1
-                # Check again and exit on failure.
-                if [ ! -f "${gamelogdir}"/server.log ]; then
-                        fn_print_fail_nl "Checking for update: linux.mtasa.com: Still No logs with server version found"
-                        fn_script_log_fatal "Checking for update: linux.mtasa.com: Still No logs with server version found"
-                        core_exit.sh
-                fi
-        fi
+	# Gets current build info
+	# Checks if current build info is available. If it fails, then a server restart will be forced to generate logs.
+	if [ ! -f "${gamelogdir}"/server.log ]; then
+		fn_print_error "Checking for update: linux.mtasa.com"
+		sleep 1
+		fn_print_error_nl "Checking for update: linux.mtasa.com: No logs with server version found"
+		fn_script_log_error "Checking for update: linux.mtasa.com: No logs with server version found"
+		sleep 1
+		fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
+		fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
+		sleep 1
+		exitbypass=1
+		command_stop.sh
+		exitbypass=1
+		command_start.sh
+		sleep 1
+		# Check again and exit on failure.
+		if [ ! -f "${gamelogdir}"/server.log ]; then
+			fn_print_fail_nl "Checking for update: linux.mtasa.com: Still No logs with server version found"
+			fn_script_log_fatal "Checking for update: linux.mtasa.com: Still No logs with server version found"
+			core_exit.sh
+		fi
+	fi
 
-        # Get current build from logs
-        currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
-        if [ -z "${currentbuild}" ]; then
-                fn_print_error_nl "Checking for update: linux.mtasa.com: Current build version not found"
-                fn_script_log_error "Checking for update: linux.mtasa.com: Current build version not found"
-                sleep 1
-                fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
-                fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
-                exitbypass=1
-                command_stop.sh
-                exitbypass=1
-                command_start.sh
-                currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
-                if [ -z "${currentbuild}" ]; then
-                        fn_print_fail_nl "Checking for update: linux.mtasa.com: Current build version still not found"
-                        fn_script_log_fatal "Checking for update: linux.mtasa.com: Current build version still not found"
-                        core_exit.sh
-                fi
-        fi
+	# Get current build from logs
+	currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
+	if [ -z "${currentbuild}" ]; then
+		fn_print_error_nl "Checking for update: linux.mtasa.com: Current build version not found"
+		fn_script_log_error "Checking for update: linux.mtasa.com: Current build version not found"
+		sleep 1
+		fn_print_info_nl "Checking for update: linux.mtasa.com: Forcing server restart"
+		fn_script_log_info "Checking for update: linux.mtasa.com: Forcing server restart"
+		exitbypass=1
+		command_stop.sh
+		exitbypass=1
+		command_start.sh
+		currentbuild=$(cat "${gamelogdir}"/server.log | grep "= Multi Theft Auto: San Andreas v" | awk '{ print $7 }'| sed -r 's/^.{1}//' | tail -1)
+		if [ -z "${currentbuild}" ]; then
+			fn_print_fail_nl "Checking for update: linux.mtasa.com: Current build version still not found"
+			fn_script_log_fatal "Checking for update: linux.mtasa.com: Current build version still not found"
+			core_exit.sh
+		fi
+	fi
 }
 
 fn_mta_get_availablebuild(){
@@ -80,75 +80,75 @@ fn_mta_get_availablebuild(){
 }
 
 fn_update_mta_compare(){
-        # Removes dots so if can compare version numbers
-        currentbuilddigit=$(echo "${currentbuild}"|tr -cd '[:digit:]')
-        if [ "${currentbuilddigit}" -ne "${numversion}" ]||[ "${forceupdate}" == "1" ]; then
-                if [ "${forceupdate}" == "1" ]; then
-                        # forceupdate bypasses checks, useful for small build changes
-                        mta_update_string="forced"
-                else
-                        mta_update_string="available"
-                fi
-                echo -e "\n"
-                echo -e "Update ${mta_update_string}:"
-                sleep 1
-                echo -e "       Current build: ${red}${currentbuild} ${default}"
-                echo -e "       Available build: ${green}${fullversion} ${default}"
-                echo -e ""
-                sleep 1
-                echo ""
-                echo -en "Applying update.\r"
-                sleep 1
-                echo -en "Applying update..\r"
-                sleep 1
-                echo -en "Applying update...\r"
-                sleep 1
-                echo -en "\n"
-                fn_script_log "Update ${mta_update_string}"
-                fn_script_log "Current build: ${currentbuild}"
-                fn_script_log "Available build: ${fullversion}"
-                fn_script_log "${currentbuild} > ${fullversion}"
+	# Removes dots so if can compare version numbers
+	currentbuilddigit=$(echo "${currentbuild}"|tr -cd '[:digit:]')
+	if [ "${currentbuilddigit}" -ne "${numversion}" ]||[ "${forceupdate}" == "1" ]; then
+		if [ "${forceupdate}" == "1" ]; then
+			# forceupdate bypasses checks, useful for small build changes
+			mta_update_string="forced"
+		else
+			mta_update_string="available"
+		fi
+		echo -e "\n"
+		echo -e "Update ${mta_update_string}:"
+		sleep 1
+		echo -e "       Current build: ${red}${currentbuild} ${default}"
+		echo -e "       Available build: ${green}${fullversion} ${default}"
+		echo -e ""
+		sleep 1
+		echo ""
+		echo -en "Applying update.\r"
+		sleep 1
+		echo -en "Applying update..\r"
+		sleep 1
+		echo -en "Applying update...\r"
+		sleep 1
+		echo -en "\n"
+		fn_script_log "Update ${mta_update_string}"
+		fn_script_log "Current build: ${currentbuild}"
+		fn_script_log "Available build: ${fullversion}"
+		fn_script_log "${currentbuild} > ${fullversion}"
 
-                unset updateonstart
+		unset updateonstart
 
-                check_status.sh
-                if [ "${status}" == "0" ]; then
-                        fn_update_mta_dl
-                        exitbypass=1
-                        command_start.sh
-                        exitbypass=1
-                        command_stop.sh
-                else
-                        exitbypass=1
-                        command_stop.sh
-                        fn_update_mta_dl
-                        exitbypass=1
-                        command_start.sh
-                fi
-                alert="update"
-                alert.sh
-        else
-                echo -e "\n"
-                echo -e "No update available:"
-                echo -e "       Current version: ${green}${currentbuild}${default}"
-                echo -e "       Available version: ${green}${fullversion}${default}"
-                echo -e ""
-                fn_print_ok_nl "No update available"
-                fn_script_log_info "Current build: ${currentbuild}"
-                fn_script_log_info "Available build: ${fullversion}"
-        fi
+		check_status.sh
+		if [ "${status}" == "0" ]; then
+			fn_update_mta_dl
+			exitbypass=1
+			command_start.sh
+			exitbypass=1
+			command_stop.sh
+		else
+			exitbypass=1
+			command_stop.sh
+			fn_update_mta_dl
+			exitbypass=1
+			command_start.sh
+		fi
+		alert="update"
+		alert.sh
+	else
+		echo -e "\n"
+		echo -e "No update available:"
+		echo -e "       Current version: ${green}${currentbuild}${default}"
+		echo -e "       Available version: ${green}${fullversion}${default}"
+		echo -e ""
+		fn_print_ok_nl "No update available"
+		fn_script_log_info "Current build: ${currentbuild}"
+		fn_script_log_info "Available build: ${fullversion}"
+	fi
 }
 
 
 if [ "${installer}" == "1" ]; then
-        fn_mta_get_availablebuild
-        fn_update_mta_dl
+	fn_mta_get_availablebuild
+	fn_update_mta_dl
 else
-        # Checks for server update from linux.mtasa.com using the github repo.
-        fn_print_dots "Checking for update: linux.mtasa.com"
-        fn_script_log_info "Checking for update: linux.mtasa.com"
-        sleep 1
-        fn_update_mta_currentbuild
-        fn_mta_get_availablebuild
-        fn_update_mta_compare
+	# Checks for server update from linux.mtasa.com using the github repo.
+	fn_print_dots "Checking for update: linux.mtasa.com"
+	fn_script_log_info "Checking for update: linux.mtasa.com"
+	sleep 1
+	fn_update_mta_currentbuild
+	fn_mta_get_availablebuild
+	fn_update_mta_compare
 fi