From 5c1741a5f9a62f07a9770becee77837063aa28a7 Mon Sep 17 00:00:00 2001
From: BogdanWDK <pletea66@gmail.com>
Date: Tue, 2 Apr 2019 13:15:40 +0100
Subject: [PATCH 1/5] Update update_factorio.sh

Specify which version to be downloaded in branch
Issue: https://github.com/GameServerManagers/LinuxGSM/issues/2252
---
 lgsm/functions/update_factorio.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index d01013224..cde4b35e6 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -153,6 +153,8 @@ if [ "${branch}" == "stable" ]; then
 	downloadbranch="stable"
 elif [ "${branch}" == "experimental" ]; then
 	downloadbranch="latest"
+else
+	downloadbranch="${branch}"
 fi
 
 if [ "${installer}" == "1" ]; then

From 4f2df835506fd9f82b4b1b93ff3c481ab388ba11 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 2 Apr 2019 15:47:14 +0100
Subject: [PATCH 2/5] fix(travis): fixed trusty being used instead of xential

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad13083c9..0074089ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
-language: bash node_js
+
+language: node_js
 dist: xenial
-sudo: required
-node_js:
-  - 10
+
 before_script:
     - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx
 install:
@@ -42,4 +41,4 @@ jobs:
     - # stage name not required
       script: bash tests/tests_ts3server.sh
     - # stage name not required
-      script: bash tests/tests_shellcheck.sh
\ No newline at end of file
+      script: bash tests/tests_shellcheck.sh

From c1535481f0a5bb450ef5e2f687d5da3c4027c9e6 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 2 Apr 2019 15:52:33 +0100
Subject: [PATCH 3/5] re-added node 10

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0074089ee..0a90bd779 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 
 language: node_js
 dist: xenial
+node_js:
+  - 10
 
 before_script:
     - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx

From 7edca8a44fe636b289e23286222269444a9f520f Mon Sep 17 00:00:00 2001
From: frisasky1 <49201678+frisasky1@users.noreply.github.com>
Date: Tue, 2 Apr 2019 22:58:01 +0800
Subject: [PATCH 4/5] fix mta download url

---
 lgsm/functions/update_mta.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh
index cdd834322..a2536f0b7 100644
--- a/lgsm/functions/update_mta.sh
+++ b/lgsm/functions/update_mta.sh
@@ -9,11 +9,11 @@ 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}"
+	fn_fetch_file "http://linux.mtasa.com/dl/multitheftauto_linux_x64.tar.gz" "${tmpdir}" "multitheftauto_linux_x64.tar.gz"
+	mkdir "${tmpdir}/multitheftauto_linux_x64"
+	fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "${tmpdir}/multitheftauto_linux_x64"
 	echo -e "copying to ${serverfiles}...\c"
-	cp -R "${tmpdir}/multitheftauto_linux_x64-${fullversion}/multitheftauto_linux_x64-${fullversion}/"* "${serverfiles}"
+	cp -R "${tmpdir}/multitheftauto_linux_x64/multitheftauto_linux_x64/"* "${serverfiles}"
 	local exitcode=$?
 	if [ "${exitcode}" == "0" ]; then
 		fn_print_ok_eol_nl

From 3f446358d07270af3f68eaa0f086f65089a7835f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 2 Apr 2019 22:39:49 +0100
Subject: [PATCH 5/5] tidy

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a90bd779..39bef46e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-
-language: node_js
+language: bash node_js
 dist: xenial
 node_js:
   - 10