From 2c67ce74a9d6ce213520844df4880ba35ec44baa Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 15:59:41 +0300
Subject: [PATCH 01/16] Initial Factorio support

---
 Factorio/fctrserver | 144 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 Factorio/fctrserver

diff --git a/Factorio/fctrserver b/Factorio/fctrserver
new file mode 100644
index 000000000..916a94f16
--- /dev/null
+++ b/Factorio/fctrserver
@@ -0,0 +1,144 @@
+#!/bin/bash
+# Factorio
+# Server Management Script
+# Author: Daniel Gibbs
+# Contributor: Kristian Polso
+# Website: https://gameservermanagers.com
+if [ -f ".dev-debug" ]; then
+	exec 5>dev-debug.log
+	BASH_XTRACEFD="5"
+	set -x
+fi
+
+version="171016"
+
+#### Variables ####
+
+# Notification Alerts
+# (on|off)
+
+# Email
+emailalert="off"
+email="email@example.com"
+#emailfrom="email@example.com"
+
+# Pushbullet
+# https://www.pushbullet.com/#settings
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+
+# Start Variables
+updateonstart="off"
+
+fn_parms(){
+parms="-fg -ini ${servercfgfullpath}"
+}
+
+#### Advanced Variables ####
+
+# Github Branch Select
+# Allows for the use of different function files
+# from a different repo and/or branch.
+githubuser="Krisseck"
+githubrepo="LinuxGSM"
+githubbranch="master"
+
+# Server Details
+gamename="Factorio"
+servicename="fctr-server"
+
+# Directories
+rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
+selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+lockselfname=".${servicename}.lock"
+lgsmdir="${rootdir}/lgsm"
+functionsdir="${lgsmdir}/functions"
+libdir="${lgsmdir}/lib"
+tmpdir="${lgsmdir}/tmp"
+filesdir="${rootdir}/serverfiles"
+systemdir="${filesdir}"
+executabledir="${filesdir}"
+executable="./bin/x64/factorio"
+servercfg="data/server-settings.json"
+servercfgdefault="data/server-settings.example.json"
+servercfgdir="${filesdir}"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+backupdir="${rootdir}/backups"
+
+# Logging
+logdays="7"
+gamelogdir="${rootdir}/log"
+scriptlogdir="${rootdir}/log/script"
+consolelogdir="${rootdir}/log/console"
+consolelogging="on"
+
+scriptlog="${scriptlogdir}/${servicename}-script.log"
+consolelog="${consolelogdir}/${servicename}-console.log"
+emaillog="${scriptlogdir}/${servicename}-email.log"
+
+scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log"
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log"
+
+##### Script #####
+# Do not edit
+
+# Fetches core_dl for file downloads
+fn_fetch_core_dl(){
+github_file_url_dir="lgsm/functions"
+github_file_url_name="${functionfile}"
+filedir="${functionsdir}"
+filename="${github_file_url_name}"
+githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
+# If the file is missing, then download
+if [ ! -f "${filedir}/${filename}" ]; then
+	if [ ! -d "${filedir}" ]; then
+		mkdir -p "${filedir}"
+	fi
+	echo -e "    fetching ${filename}...\c"
+	# Check curl exists and use available path
+	curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)"
+	for curlcmd in ${curlpaths}
+	do
+		if [ -x "${curlcmd}" ]; then
+			break
+		fi
+	done
+	# If curl exists download file
+	if [ "$(basename ${curlcmd})" == "curl" ]; then
+		curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1)
+		if [ $? -ne 0 ]; then
+			echo -e "\e[0;31mFAIL\e[0m\n"
+			echo "${curlfetch}"
+			echo -e "${githuburl}\n"
+			exit 1
+		else
+			echo -e "\e[0;32mOK\e[0m"
+		fi
+	else
+		echo -e "\e[0;31mFAIL\e[0m\n"
+		echo "Curl is not installed!"
+		echo -e ""
+		exit 1
+	fi
+	chmod +x "${filedir}/${filename}"
+fi
+source "${filedir}/${filename}"
+}
+
+core_dl.sh(){
+# Functions are defined in core_functions.sh.
+functionfile="${FUNCNAME}"
+fn_fetch_core_dl
+}
+
+core_functions.sh(){
+# Functions are defined in core_functions.sh.
+functionfile="${FUNCNAME}"
+fn_fetch_core_dl
+}
+
+core_dl.sh
+core_functions.sh
+
+getopt=$1
+core_getopt.sh

From 3b6336c388aabb0f0ee49d00218620d8fa377a6f Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 16:22:45 +0300
Subject: [PATCH 02/16] Factorio update scripts

---
 lgsm/functions/command_update.sh       |   2 +
 lgsm/functions/install_server_files.sh |   2 +
 lgsm/functions/update_factorio.sh      | 165 +++++++++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 lgsm/functions/update_factorio.sh

diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh
index bffa4e6ea..13fff9e90 100644
--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@@ -19,6 +19,8 @@ elif [ "${engine}" == "lwjgl2" ]; then
 	update_minecraft.sh
 elif [ "${gamename}" == "Mumble" ]; then
 	update_mumble.sh
+elif [ "${gamename}" == "Factorio" ]; then
+        update_factorio.sh
 else
 	update_steamcmd.sh
 fi
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index e2778ae64..aab2a716a 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -112,6 +112,8 @@ elif [ "${gamename}" == "Minecraft" ]; then
 	install_minecraft_eula.sh
 elif [ "${gamename}" == "Mumble" ]; then
 	update_mumble.sh
+elif [ "${gamename}" == "Factorio" ]; then
+        update_factorio.sh
 elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]; then
 	fn_install_server_files
 fi
diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
new file mode 100644
index 000000000..3bea70bee
--- /dev/null
+++ b/lgsm/functions/update_factorio.sh
@@ -0,0 +1,165 @@
+#!/bin/bash
+# LGSM update_factorio.sh function
+# Author: Daniel Gibbs
+# Contributor: Kristian Polso
+# Website: https://gameservermanagers.com
+# Description: Handles updating of Factorio servers.
+
+local commandname="UPDATE"
+local commandaction="Update"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+
+fn_update_factorio_dl(){
+	fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz"
+	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}"
+	echo -e "copying to ${filesdir}...\c"
+	fn_script_log "Copying to ${filesdir}"
+	cp -R "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}/"* "${filesdir}"
+	local exitcode=$?
+	if [ ${exitcode} -eq 0 ]; then
+		fn_print_ok_eol_nl
+	else
+		fn_print_fail_eol_nl
+	fi
+}
+
+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
+		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"
+		fn_script_log_error "Checking for update: Factorio.com: No logs with server version found"
+		sleep 1
+		fn_print_info_nl "Checking for update: Factorio.com: Forcing server restart"
+		fn_script_log_info "Checking for update: Factorio.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 "${consolelogdir}/${servicename}-console.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
+		fi
+	fi
+
+	# Get current build from logs
+	currentbuild=$(cat "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null | sort | grep -oP '(?<=Factorio ).*?(?= /)')
+	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"
+		sleep 1
+		fn_print_info_nl "Checking for update: Factorio.com: Forcing server restart"
+		fn_script_log_info "Checking for update: Factorio.com: Forcing server restart"
+		exitbypass=1
+		command_stop.sh
+		exitbypass=1
+		command_start.sh
+		currentbuild=$(cat "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null | sort | grep -oP '(?<=Factorio ).*?(?= /)')
+		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"
+			core_exit.sh
+		fi
+	fi
+}
+
+fn_update_factorio_arch(){
+	# Factorio is linux64 only for now
+	factorioarch="linux64"
+}
+
+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/).*?(?=/)')
+	sleep 1
+
+	# Checks if availablebuild variable has been set
+	if [ -z "${availablebuild}" ]; then
+		fn_print_fail "Checking for update: Factorio.com"
+		sleep 1
+		fn_print_fail "Checking for update: Factorio.com: Not returning version info"
+		fn_script_log_fatal "Failure! Checking for update: Factorio.com: Not returning version info"
+		core_exit.sh
+	else
+		fn_print_ok "Checking for update: Factorio.com"
+		fn_script_log_pass "Checking for update: Factorio.com"
+		sleep 1
+	fi
+}
+
+fn_update_factorio_compare(){
+	# Removes dots so if can compare version numbers
+	currentbuilddigit=$(echo "${currentbuild}"|tr -cd '[:digit:]')
+	availablebuilddigit=$(echo "${availablebuild}"|tr -cd '[:digit:]')
+
+	if [ "${currentbuilddigit}" -ne "${availablebuilddigit}" ]; then
+		echo -e "\n"
+		echo -e "Update available:"
+		sleep 1
+		echo -e "	Current build: ${red}${currentbuild} ${factorioarch}${default}"
+		echo -e "	Available build: ${green}${availablebuild} ${factorioarch}${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 available"
+		fn_script_log "Current build: ${currentbuild}"
+		fn_script_log "Available build: ${availablebuild}"
+		fn_script_log "${currentbuild} > ${availablebuild}"
+
+		unset updateonstart
+
+		check_status.sh
+		if [ "${status}" == "0" ]; then
+			fn_update_factorio_dl
+			exitbypass=1
+			command_start.sh
+			exitbypass=1
+			command_stop.sh
+		else
+			exitbypass=1
+			command_stop.sh
+			fn_update_factorio_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}${availablebuild}${default}"
+		echo -e ""
+		fn_print_ok_nl "No update available"
+		fn_script_log_info "Current build: ${currentbuild}"
+		fn_script_log_info "Available build: ${availablebuild}"
+	fi
+}
+
+
+fn_update_factorio_arch
+if [ "${installer}" == "1" ]; then
+	fn_update_factorio_availablebuild
+	fn_update_factorio_dl
+else
+	# Checks for server update from github.com
+	fn_print_dots "Checking for update: github.com"
+	fn_script_log_info "Checking for update: github.com"
+	sleep 1
+	fn_update_factorio_currentbuild
+	fn_update_factorio_availablebuild
+	fn_update_factorio_compare
+fi

From 88f35767e2c2bfcf7ea639ec9e73b491edee0d23 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 16:30:06 +0300
Subject: [PATCH 03/16] More integration

---
 lgsm/functions/command_install.sh | 2 +-
 lgsm/functions/install_config.sh  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh
index 5b741a126..030b5a9dc 100644
--- a/lgsm/functions/command_install.sh
+++ b/lgsm/functions/command_install.sh
@@ -18,7 +18,7 @@ check_deps.sh
 if [ "${gamename}" == "Unreal Tournament 2004" ]; then
 	install_server_files.sh
 	install_ut2k4_key.sh
-elif [ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]; then
+elif [ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Factorio" ]; then
 	installer=1
 	install_server_files.sh
 elif [ -n "${appid}" ]; then
diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index 997bc4cc2..97d12c972 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -169,6 +169,8 @@ elif [ "${gamename}" == "Double Action: Boogaloo" ]; then
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_set_config_vars
+elif [ "${gamename}" == "Factorio" ]; then
+	:
 elif [ "${gamename}" == "Fistful of Frags" ]; then
 	gamedirname="FistfulofFrags"
 	array_configs+=( server.cfg )

From 4047ea2ca34899c5efe4a7c4607042fad7599075 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 16:37:44 +0300
Subject: [PATCH 04/16] Missing stuff

---
 lgsm/functions/core_functions.sh       | 5 +++++
 lgsm/functions/install_server_files.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index 987ffcde9..10af8cfcf 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -444,6 +444,11 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
+update_factorio.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
 update_steamcmd.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index aab2a716a..30216d7d0 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -113,7 +113,7 @@ elif [ "${gamename}" == "Minecraft" ]; then
 elif [ "${gamename}" == "Mumble" ]; then
 	update_mumble.sh
 elif [ "${gamename}" == "Factorio" ]; then
-        update_factorio.sh
+  update_factorio.sh
 elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]; then
 	fn_install_server_files
 fi

From d8c1b2d6012992dc179183bfdb530c07a737db76 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 17:00:14 +0300
Subject: [PATCH 05/16] Extract dir

---
 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 3bea70bee..6f449bde3 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -11,7 +11,7 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_update_factorio_dl(){
 	fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz"
-	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}"
+	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}"
 	echo -e "copying to ${filesdir}...\c"
 	fn_script_log "Copying to ${filesdir}"
 	cp -R "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}/"* "${filesdir}"

From b0b21d888b95a79c6b69c500bc35831c5eae1575 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 17:05:24 +0300
Subject: [PATCH 06/16] Correct folder

---
 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 6f449bde3..00c75012d 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -10,7 +10,7 @@ local commandaction="Update"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_update_factorio_dl(){
-	fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz"
+	fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz"
 	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}"
 	echo -e "copying to ${filesdir}...\c"
 	fn_script_log "Copying to ${filesdir}"

From 3e33596836432fbef53d2f048003bf69a3e80363 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 17:09:44 +0300
Subject: [PATCH 07/16] Tmp dir stuff

---
 lgsm/functions/update_factorio.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index 00c75012d..dba918df7 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -10,11 +10,11 @@ local commandaction="Update"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_update_factorio_dl(){
-	fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz"
-	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}"
+	fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz"
+	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}"
 	echo -e "copying to ${filesdir}...\c"
 	fn_script_log "Copying to ${filesdir}"
-	cp -R "${tmpdir}/factorio_headless_${factorioarch}-${availablebuild}/"* "${filesdir}"
+	cp -R "${tmpdir}/"* "${filesdir}"
 	local exitcode=$?
 	if [ ${exitcode} -eq 0 ]; then
 		fn_print_ok_eol_nl

From 7874986b94b484230466dc977960e2130a24152e Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Mon, 17 Oct 2016 17:14:50 +0300
Subject: [PATCH 08/16] Tmpdir factorio

---
 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 dba918df7..bc8339bde 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -14,7 +14,7 @@ fn_update_factorio_dl(){
 	fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" "${tmpdir}"
 	echo -e "copying to ${filesdir}...\c"
 	fn_script_log "Copying to ${filesdir}"
-	cp -R "${tmpdir}/"* "${filesdir}"
+	cp -R "${tmpdir}/factorio/"* "${filesdir}"
 	local exitcode=$?
 	if [ ${exitcode} -eq 0 ]; then
 		fn_print_ok_eol_nl

From 3c136bc1a265d01a1d8a61869fb467fca4e00ddb Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 12:44:41 +0300
Subject: [PATCH 09/16] Create initial save

---
 lgsm/functions/install_factorio_save.sh | 14 ++++++++++++++
 lgsm/functions/install_server_files.sh  |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 lgsm/functions/install_factorio_save.sh

diff --git a/lgsm/functions/install_factorio_save.sh b/lgsm/functions/install_factorio_save.sh
new file mode 100644
index 000000000..ed71fe166
--- /dev/null
+++ b/lgsm/functions/install_factorio_save.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# LGSM install_factorio_save.sh function
+# Author: Kristian Polso
+# Website: https://gameservermanagers.com
+# Description: Creates the initial save file for Factorio
+
+local commandname="INSTALL"
+local commandaction="Install"
+
+echo ""
+echo "Creating initial Factorio savefile"
+echo "================================="
+sleep 1
+${filesdir}/bin/x64/factorio --create-save ${filesdir}/save1
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index 30216d7d0..b4a6fa22d 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -114,6 +114,7 @@ elif [ "${gamename}" == "Mumble" ]; then
 	update_mumble.sh
 elif [ "${gamename}" == "Factorio" ]; then
   update_factorio.sh
+  install_factorio_save.sh
 elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]; then
 	fn_install_server_files
 fi

From e13c816940a13ed2041345e08d4d552693501697 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 12:48:23 +0300
Subject: [PATCH 10/16] Fetch install_factorio_save

---
 lgsm/functions/core_functions.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index 10af8cfcf..de66fb55f 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -479,6 +479,11 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
+install_factorio_save.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
 install_gsquery.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function

From ab7f487a5525b9ed38f9fe378b7e18d2f282fb8f Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 13:06:12 +0300
Subject: [PATCH 11/16] Factorio configs

---
 Factorio/cfg/lgsm-default.cfg           | 23 +++++++++++++++++++++++
 lgsm/functions/install_config.sh        |  6 +++++-
 lgsm/functions/install_factorio_save.sh |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 Factorio/cfg/lgsm-default.cfg

diff --git a/Factorio/cfg/lgsm-default.cfg b/Factorio/cfg/lgsm-default.cfg
new file mode 100644
index 000000000..a433fe726
--- /dev/null
+++ b/Factorio/cfg/lgsm-default.cfg
@@ -0,0 +1,23 @@
+
+  "name": "<hostname>",
+  "description": "Description of the game that will appear in the listing",
+  "tags": ["game", "tags"],
+  "max_players": "0",
+
+  "_comment_visibility": ["public: Game will be published on the official Factorio matching server",
+                          "lan: Game will be broadcast on LAN",
+                          "hidden: Game will not be published anywhere"],
+  "visibility": "public",
+
+  "_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
+  "username": "",
+  "password": "",
+
+  "_comment_token": "Authentication token. May be used instead of 'password' above.",
+  "token": "",
+
+  "game_password": "<rconpassword>",
+
+  "_comment_verify_user_identity": "When set to true, the server will only allow clients that have a valid Factorio.com account",
+  "verify_user_identity": true
+}
diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index 97d12c972..0489a915d 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -170,7 +170,11 @@ elif [ "${gamename}" == "Double Action: Boogaloo" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 elif [ "${gamename}" == "Factorio" ]; then
-	:
+	gamedirname="Factorio"
+	array_configs+=( server-settings.json )
+	fn_fetch_default_config
+	fn_default_config_remote
+	fn_set_config_vars
 elif [ "${gamename}" == "Fistful of Frags" ]; then
 	gamedirname="FistfulofFrags"
 	array_configs+=( server.cfg )
diff --git a/lgsm/functions/install_factorio_save.sh b/lgsm/functions/install_factorio_save.sh
index ed71fe166..36ef169cb 100644
--- a/lgsm/functions/install_factorio_save.sh
+++ b/lgsm/functions/install_factorio_save.sh
@@ -11,4 +11,4 @@ echo ""
 echo "Creating initial Factorio savefile"
 echo "================================="
 sleep 1
-${filesdir}/bin/x64/factorio --create-save ${filesdir}/save1
+${filesdir}/bin/x64/factorio --create ${filesdir}/save1

From 253f5db2ccac98f86729c8e4628c150584102ae4 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 13:22:56 +0300
Subject: [PATCH 12/16] Configs

---
 Factorio/cfg/lgsm-default.cfg           | 23 -----------------------
 lgsm/functions/install_config.sh        |  6 +-----
 lgsm/functions/install_factorio_save.sh |  1 +
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 Factorio/cfg/lgsm-default.cfg

diff --git a/Factorio/cfg/lgsm-default.cfg b/Factorio/cfg/lgsm-default.cfg
deleted file mode 100644
index a433fe726..000000000
--- a/Factorio/cfg/lgsm-default.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-  "name": "<hostname>",
-  "description": "Description of the game that will appear in the listing",
-  "tags": ["game", "tags"],
-  "max_players": "0",
-
-  "_comment_visibility": ["public: Game will be published on the official Factorio matching server",
-                          "lan: Game will be broadcast on LAN",
-                          "hidden: Game will not be published anywhere"],
-  "visibility": "public",
-
-  "_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
-  "username": "",
-  "password": "",
-
-  "_comment_token": "Authentication token. May be used instead of 'password' above.",
-  "token": "",
-
-  "game_password": "<rconpassword>",
-
-  "_comment_verify_user_identity": "When set to true, the server will only allow clients that have a valid Factorio.com account",
-  "verify_user_identity": true
-}
diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index 0489a915d..97d12c972 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -170,11 +170,7 @@ elif [ "${gamename}" == "Double Action: Boogaloo" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 elif [ "${gamename}" == "Factorio" ]; then
-	gamedirname="Factorio"
-	array_configs+=( server-settings.json )
-	fn_fetch_default_config
-	fn_default_config_remote
-	fn_set_config_vars
+	:
 elif [ "${gamename}" == "Fistful of Frags" ]; then
 	gamedirname="FistfulofFrags"
 	array_configs+=( server.cfg )
diff --git a/lgsm/functions/install_factorio_save.sh b/lgsm/functions/install_factorio_save.sh
index 36ef169cb..8a9850818 100644
--- a/lgsm/functions/install_factorio_save.sh
+++ b/lgsm/functions/install_factorio_save.sh
@@ -12,3 +12,4 @@ echo "Creating initial Factorio savefile"
 echo "================================="
 sleep 1
 ${filesdir}/bin/x64/factorio --create ${filesdir}/save1
+cp ${filesdir}/data/server-settings.example.json ${filesdir}/data/server-settings.json

From 057f1fed234437e88067ca7433909afcc253b2b0 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 13:32:50 +0300
Subject: [PATCH 13/16] Details

---
 lgsm/functions/command_details.sh | 2 +-
 lgsm/functions/info_glibc.sh      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index 2ae4632f0..7dbbd5e52 100644
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -290,7 +290,7 @@ fn_details_ports(){
 
 	parmslocation="${red}UNKNOWN${default}"
 	# engines that require editing in the config file
-	local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "lwjgl2" "projectzomboid" "idtech3_ql" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" )
+	local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "lwjgl2" "projectzomboid" "idtech3_ql" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" "Factorio" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then
diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index 655402584..3f5740571 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -23,6 +23,9 @@ elif [ "${gamename}" == "Double Action: Boogaloo" ]; then
 elif [ "${gamename}" == "Empires Mod" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"
+elif [ "${gamename}" == "Factorio" ]; then
+	glibcrequired="2.15"
+	glibcfix="yes"
 elif [ "${gamename}" == "Fistful of Frags" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"

From f7e99e6428b07e3edd27911c9fdd21888a81bcdd Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 13:43:51 +0300
Subject: [PATCH 14/16] Details

---
 lgsm/functions/command_details.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index 7dbbd5e52..e9f8f6b4c 100644
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -290,7 +290,7 @@ fn_details_ports(){
 
 	parmslocation="${red}UNKNOWN${default}"
 	# engines that require editing in the config file
-	local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "lwjgl2" "projectzomboid" "idtech3_ql" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" "Factorio" )
+	local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "lwjgl2" "projectzomboid" "idtech3_ql" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then
@@ -298,7 +298,7 @@ fn_details_ports(){
 		fi
 	done
 	# engines that require editing in the script file
-	local ports_edit_array=( "starbound" "spark" "source" "goldsource" "Rust" "Hurtworld" "unreal4")
+	local ports_edit_array=( "starbound" "spark" "source" "goldsource" "Rust" "Hurtworld" "unreal4" "Factorio" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then
@@ -340,6 +340,15 @@ fn_details_dontstarve(){
 	} | column -s $'\t' -t
 }
 
+fn_details_factorio(){
+	echo -e "netstat -atunp | grep factorio"
+	echo -e ""
+	{
+		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
+		echo -e "> Game\tINBOUND\t${port}\ttcp"
+	} | column -s $'\t' -t
+}
+
 fn_details_minecraft(){
 	echo -e "netstat -atunp | grep java"
 	echo -e ""
@@ -673,6 +682,8 @@ fn_display_details() {
 		fn_details_rust
 	elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
 		fn_details_wolfensteinenemyterritory
+	elif [ "${gamename}" == "Factorio" ]; then
+		fn_details_factorio
 	else
 		fn_print_error_nl "Unable to detect server engine."
 	fi
@@ -685,3 +696,4 @@ then
   fn_display_details
   core_exit.sh
 fi
+

From 9fccb196196457e3144e970b76ac67c9358ce202 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian@vaiste.com>
Date: Wed, 19 Oct 2016 13:50:24 +0300
Subject: [PATCH 15/16] Update fctrserver

---
 Factorio/fctrserver | 76 ++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/Factorio/fctrserver b/Factorio/fctrserver
index 916a94f16..6ef50a96a 100644
--- a/Factorio/fctrserver
+++ b/Factorio/fctrserver
@@ -5,9 +5,9 @@
 # Contributor: Kristian Polso
 # Website: https://gameservermanagers.com
 if [ -f ".dev-debug" ]; then
-	exec 5>dev-debug.log
-	BASH_XTRACEFD="5"
-	set -x
+        exec 5>dev-debug.log
+        BASH_XTRACEFD="5"
+        set -x
 fi
 
 version="171016"
@@ -27,11 +27,15 @@ email="email@example.com"
 pushbulletalert="off"
 pushbullettoken="accesstoken"
 
-# Start Variables
+# Server settings
+# More settings available after install in serverfiles/data/server-settings.json
 updateonstart="off"
+port="34197"
+rconport="34198"
+rconpassword="factorio"
 
 fn_parms(){
-parms="-fg -ini ${servercfgfullpath}"
+parms="--start-server ${filesdir}/save1.zip --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}"
 }
 
 #### Advanced Variables ####
@@ -91,36 +95,36 @@ filename="${github_file_url_name}"
 githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
 # If the file is missing, then download
 if [ ! -f "${filedir}/${filename}" ]; then
-	if [ ! -d "${filedir}" ]; then
-		mkdir -p "${filedir}"
-	fi
-	echo -e "    fetching ${filename}...\c"
-	# Check curl exists and use available path
-	curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)"
-	for curlcmd in ${curlpaths}
-	do
-		if [ -x "${curlcmd}" ]; then
-			break
-		fi
-	done
-	# If curl exists download file
-	if [ "$(basename ${curlcmd})" == "curl" ]; then
-		curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1)
-		if [ $? -ne 0 ]; then
-			echo -e "\e[0;31mFAIL\e[0m\n"
-			echo "${curlfetch}"
-			echo -e "${githuburl}\n"
-			exit 1
-		else
-			echo -e "\e[0;32mOK\e[0m"
-		fi
-	else
-		echo -e "\e[0;31mFAIL\e[0m\n"
-		echo "Curl is not installed!"
-		echo -e ""
-		exit 1
-	fi
-	chmod +x "${filedir}/${filename}"
+        if [ ! -d "${filedir}" ]; then
+                mkdir -p "${filedir}"
+        fi
+        echo -e "    fetching ${filename}...\c"
+        # Check curl exists and use available path
+        curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)"
+        for curlcmd in ${curlpaths}
+        do
+                if [ -x "${curlcmd}" ]; then
+                        break
+                fi
+        done
+        # If curl exists download file
+        if [ "$(basename ${curlcmd})" == "curl" ]; then
+                curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1)
+                if [ $? -ne 0 ]; then
+                        echo -e "\e[0;31mFAIL\e[0m\n"
+                        echo "${curlfetch}"
+                        echo -e "${githuburl}\n"
+                        exit 1
+                else
+                        echo -e "\e[0;32mOK\e[0m"
+                fi
+        else
+                echo -e "\e[0;31mFAIL\e[0m\n"
+                echo "Curl is not installed!"
+                echo -e ""
+                exit 1
+        fi
+        chmod +x "${filedir}/${filename}"
 fi
 source "${filedir}/${filename}"
 }
@@ -141,4 +145,4 @@ core_dl.sh
 core_functions.sh
 
 getopt=$1
-core_getopt.sh
+core_getopt.sh
\ No newline at end of file

From 0526935d32c1671d313c16486c578fc776537d36 Mon Sep 17 00:00:00 2001
From: Kristian Polso <kristian.polso@gmail.com>
Date: Wed, 19 Oct 2016 17:44:24 +0300
Subject: [PATCH 16/16] Typo in fn_update_factorio_currentbuild

---
 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 bc8339bde..8122678a0 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=$(cat "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null | sort | grep -oP '(?<=Factorio ).*?(?= /)')
+	currentbuild=$(cat "${consolelogdir}"/"${servicename}"-console.log 2> /dev/null | sort | grep -oP '(?<=Factorio ).*?(?= \()')
 	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"