From 5ab6cdaf46e393418682a8da1acb3b185c1576dd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 25 Oct 2015 21:39:51 +0000
Subject: [PATCH] Updated from master

---
 .../cfg/{terraria-server.txt => lgsm-default.txt}    |  2 +-
 Terraria/terrariaserver                              |  1 +
 functions/fn_details                                 |  2 +-
 functions/fn_details_config                          |  7 +++++++
 functions/fn_install_config                          | 12 ++++++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)
 rename Terraria/cfg/{terraria-server.txt => lgsm-default.txt} (99%)

diff --git a/Terraria/cfg/terraria-server.txt b/Terraria/cfg/lgsm-default.txt
similarity index 99%
rename from Terraria/cfg/terraria-server.txt
rename to Terraria/cfg/lgsm-default.txt
index c04a5b556..d6258d4cf 100644
--- a/Terraria/cfg/terraria-server.txt
+++ b/Terraria/cfg/lgsm-default.txt
@@ -64,5 +64,5 @@
 #npcstream=60
 
 #Default system priority 0:Realtime, 1:High, 2:AboveNormal, 3:Normal, 4:BelowNormal, 5:Idle
-priority=1
+#priority=1
 
diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver
index 57392162c..a32af02d7 100644
--- a/Terraria/terrariaserver
+++ b/Terraria/terrariaserver
@@ -46,6 +46,7 @@ executable="./TerrariaServer"
 servercfg="${servicename}.txt"
 servercfgdir="${filesdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
+servercfgdefault="${servercfgdir}/lgsm-default.txt"
 backupdir="${rootdir}/backups"
 
 # Logging
diff --git a/functions/fn_details b/functions/fn_details
index a6175744c..f4398cced 100644
--- a/functions/fn_details
+++ b/functions/fn_details
@@ -541,7 +541,7 @@ echo -e ""
 echo -e "\e[92mPorts\e[0m"
 printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' =
 echo -e "Change ports by editing the command-line"
-echo -e "parameters in ${selfname}."
+echo -e "parameters in ${servercfgfullpath}."
 echo -e ""
 echo -e "Useful port diagnostic command:"
 echo -e "netstat -atunp | grep terraia"
diff --git a/functions/fn_details_config b/functions/fn_details_config
index 89e600aaa..c60d432fc 100644
--- a/functions/fn_details_config
+++ b/functions/fn_details_config
@@ -388,6 +388,13 @@ elif [ "${engine}" == "teeworlds" ]; then
 	if [ -f "${servercfgfullpath}" ]; then
 		port=$(grep "DefaultPort=" "${servercfgfullpath}" | tr -cd "[:digit:]")
 	fi
+			
+elif [ "${engine}" == "terraria" ]; then
+
+	# port
+	if [ -f "${servercfgfullpath}" ]; then
+		port=$(grep "port=" "${servercfgfullpath}" | tr -cd "[:digit:]")
+	fi
 	if [ ! -n "${port}" ]; then
 		port="0"
 	fi
diff --git a/functions/fn_install_config b/functions/fn_install_config
index 27b5586ae..a3b6b3d2a 100644
--- a/functions/fn_install_config
+++ b/functions/fn_install_config
@@ -116,6 +116,13 @@ sed -i "s/\"rconpassword\"/\"${rconpass}\"/g" "${servercfgfullpath}"
 echo ""
 }
 
+fn_terrariaconfig(){
+echo "creating ${servercfg} config file."
+cp -v "${servercfgdefault}" "${servercfgfullpath}"
+sleep 1
+echo ""
+}
+
 fn_ts3config(){
 echo "creating blank ${servercfg} config file."
 sleep 1
@@ -322,6 +329,11 @@ elif [ "${gamename}" == "Team Fortress Classic" ]; then
 	wget -N /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/TeamFortressClassic/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1
 	fn_goldsourceconfig
+elif [ "${gamename}" == "Terraria" ]; then
+	echo -e "downloading lgsm-default.txt...\c"
+	wget -N /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/Terraria/cfg/lgsm-default.txt 2>&1 | grep -F HTTP | cut -c45- | uniq
+	sleep 1
+	fn_terrariaconfig
 elif [ "${gamename}" == "Unreal Tournament 2004" ]; then
 	fn_unreal2config
 elif [ "${gamename}" == "Unreal Tournament 99" ]; then