Merge branch 'hotfix/190401.1'

.travis.yml

@@ -1,8 +1,8 @@
 language: bash 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 +42,4 @@ jobs:
     - # stage name not required
       script: bash tests/tests_ts3server.sh
     - # stage name not required
-      script: bash tests/tests_shellcheck.sh
+      script: bash tests/tests_shellcheck.sh

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

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