Merge pull request #1476 from GameServerManagers/bug-1466

Fixed MTA not finding the update version

lgsm/functions/update_mta.sh

@@ -10,10 +10,11 @@ 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"
-	fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}"
-	echo -e "copying to ${serverfiles}...\c"
-	fn_script_log "Copying to ${serverfiles}"
-	cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/"* "${serverfiles}"
+  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
@@ -25,7 +26,7 @@ fn_update_mta_dl(){
 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 "${consolelogdir}/${servicename}-console.log" ]; then
+        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"
@@ -40,7 +41,7 @@ fn_update_mta_currentbuild(){
                 command_start.sh
                 sleep 1
                 # Check again and exit on failure.
-		if [ ! -f "${consolelogdir}/${servicename}-console.log" ]; then
+                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
@@ -48,7 +49,7 @@ fn_update_mta_currentbuild(){
         fi
 
         # Get current build from logs
-	currentbuild=$(awk -F"= Multi Theft Auto: San Andreas v" '{print $2}' "${consolelogdir}"/"${servicename}"-console.log | awk '{print $1}')
+        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"
@@ -59,7 +60,7 @@ fn_update_mta_currentbuild(){
                 command_stop.sh
                 exitbypass=1
                 command_start.sh
-		currentbuild=$(awk -F"= Multi Theft Auto: San Andreas v" '{print $2}' "${consolelogdir}"/"${servicename}"-console.log | awk '{print $1}')
+                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"
@@ -138,6 +139,7 @@ fn_update_mta_compare(){
         fi
 }
 
+
 if [ "${installer}" == "1" ]; then
         fn_mta_get_availablebuild
         fn_update_mta_dl