From c55bd13ea5716e966da829d9de02cf378a0c2d98 Mon Sep 17 00:00:00 2001
From: Stephan Schaffner <stephan.schaffner@check24.de>
Date: Fri, 23 Aug 2024 16:00:55 +0200
Subject: [PATCH] Updating paths and install script

---
 lgsm/config-default/config-lgsm/xntserver/_default.cfg | 8 ++++----
 lgsm/modules/install_server_files.sh                   | 2 +-
 lgsm/modules/update_xnt.sh                             | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/xntserver/_default.cfg b/lgsm/config-default/config-lgsm/xntserver/_default.cfg
index 212c3d597..997b620e9 100644
--- a/lgsm/config-default/config-lgsm/xntserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/xntserver/_default.cfg
@@ -12,7 +12,7 @@
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 # List of game types and mutators: https://docs.linuxgsm.com/game-servers/unreal-tournament-3
-startparameters="-userdir ${serverfiles}/${selfname}"
+startparameters="-userdir ${serverfiles}/Xonotic/${selfname}"
 
 #### LinuxGSM Settings ####
 
@@ -140,10 +140,10 @@ glibc="2.3.2"
 # Edit with care
 
 ## Game Server Directories
-systemdir="${serverfiles}"
-executabledir="${serverfiles}"
+systemdir="${serverfiles}/Xonotic/"
+executabledir="${serverfiles}/Xonotic/"
 executable="./xonotic-linux64-dedicated"
-servercfgdir="${serverfiles}/${selfname}"
+servercfgdir="${serverfiles}/Xonotic/${selfname}"
 servercfg="server.cfg"
 
 ## Backup Directory
diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh
index 5401c9324..d4a204ce8 100644
--- a/lgsm/modules/install_server_files.sh
+++ b/lgsm/modules/install_server_files.sh
@@ -256,7 +256,7 @@ elif [ "${shortname}" == "ut99" ]; then
 	update_ut99.sh
 elif [ "${shortname}" == "xnt" ]; then
 	fn_install_server_files
-	update_xnt.sh
+	bash update_xnt.sh
 elif [ -z "${appid}" ] || [ "${shortname}" == "ahl" ] || [ "${shortname}" == "bb" ] || [ "${shortname}" == "q4" ] || [ "${shortname}" == "ns" ] || [ "${shortname}" == "sfc" ] || [ "${shortname}" == "ts" ] || [ "${shortname}" == "vs" ] || [ "${shortname}" == "zmr" ]; then
 	if [ "${shortname}" == "ut" ]; then
 		install_eula.sh
diff --git a/lgsm/modules/update_xnt.sh b/lgsm/modules/update_xnt.sh
index 2db7d5510..d795bb4a4 100644
--- a/lgsm/modules/update_xnt.sh
+++ b/lgsm/modules/update_xnt.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
-# LinuxGSM install_steamcmd.sh module
+# LinuxGSM update_xnt module
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Downloads SteamCMD on install.
+# Description: Install Xonotic Default Config
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "${bold}${lightyellow}Installing Xonotic${default}"
 fn_messages_separator
-mkdir -p "${serverfiles}/${selfname}/data"
-cp "${serverfiles}/server/server.cfg ${serverfiles}/${selfname}/data/server.cfg"
+mkdir -p "${serverfiles}/Xonotic/${selfname}/data"
+cp "${serverfiles}/Xonotic/server/server.cfg ${serverfiles}/Xonotic/${selfname}/data/server.cfg"