From 22a8f19eee5b991b837c9e3c6f2e884a0ea5b820 Mon Sep 17 00:00:00 2001
From: Digital-Storm <Digital-Storm@users.noreply.github.com>
Date: Tue, 2 May 2017 16:59:53 -0400
Subject: [PATCH 1/4] Add updatebranch variable

Add updatebranch variable.
---
 Factorio/fctrserver | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Factorio/fctrserver b/Factorio/fctrserver
index a149b4684..2100c2733 100644
--- a/Factorio/fctrserver
+++ b/Factorio/fctrserver
@@ -49,6 +49,7 @@ channeltag=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update
 updateonstart="off"
+updatebranch="stable"
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup
 maxbackups="4"
@@ -187,4 +188,4 @@ fi
 core_dl.sh
 core_functions.sh
 getopt=$1
-core_getopt.sh
\ No newline at end of file
+core_getopt.sh

From e4e18f7122ae0a86ce89e62f55a242283611a3d8 Mon Sep 17 00:00:00 2001
From: Digital-Storm <Digital-Storm@users.noreply.github.com>
Date: Tue, 2 May 2017 17:03:22 -0400
Subject: [PATCH 2/4] Added support for mimetype application/x-xz

Factorio now uses the mimetype application/x-xz for compressed experimental builds. Added the tar extraction command for this.
---
 lgsm/functions/core_dl.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
index d6c9b58ca..606f0b442 100644
--- a/lgsm/functions/core_dl.sh
+++ b/lgsm/functions/core_dl.sh
@@ -60,6 +60,8 @@ fn_dl_extract(){
 		tarcmd=$(tar -zxf "${filedir}/${filename}" -C "${extractdir}")
 	elif [ "${mime}" == "application/x-bzip2" ]; then
 		tarcmd=$(tar -jxf "${filedir}/${filename}" -C "${extractdir}")
+	elif [ "${mime}" == "application/x-xz" ]; then
+		tarcmd=$(tar -xf "${filedir}/${filename}" -C "${extractdir}")
 	elif [ "${mime}" == "application/zip" ]; then
 		tarcmd=$(unzip -d "${extractdir}" "${filedir}/${filename}")
 	fi

From 3b49592e9149a0aed99b9ac14da54378d2b9bb3d Mon Sep 17 00:00:00 2001
From: Digital-Storm <Digital-Storm@users.noreply.github.com>
Date: Tue, 2 May 2017 17:05:05 -0400
Subject: [PATCH 3/4] currentbuild return only 1 line

Current experimental loads multiple base version files, modified to tail -1 and return only 1 line, so updater checks version properly.
---
 lgsm/functions/update_factorio.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index cbb39ef18..934a30dbb 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.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}')
+	currentbuild=$(grep "Loading mod base" "${consolelogdir}"/"${servicename}"-console.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}')
+		currentbuild=$(grep "Loading mod base" "${consolelogdir}"/"${servicename}"-console.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"

From e2f05f1ff3309397b780373044ae0670d8a28b1a Mon Sep 17 00:00:00 2001
From: Digital-Storm <Digital-Storm@users.noreply.github.com>
Date: Tue, 2 May 2017 17:07:21 -0400
Subject: [PATCH 4/4] Modified available build to use updatebranch var

Added updatebranch var to the available build url.
---
 lgsm/functions/update_factorio.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index 934a30dbb..5b9d64e8d 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -76,7 +76,7 @@ fn_update_factorio_arch(){
 
 fn_update_factorio_availablebuild(){
 	# Gets latest build info.
-	availablebuild=$(curl -s https://www.factorio.com/download-headless/stable | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
+	availablebuild=$(curl -s https://www.factorio.com/download-headless/"${updatebranch}" | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
 	sleep 1
 
 	# Checks if availablebuild variable has been set