From b8240ff6d9efd23cb589424564e9a89bdc0bb284 Mon Sep 17 00:00:00 2001
From: AlexCS1337 <alexander.carlos.silva@gmail.com>
Date: Sat, 27 Jul 2024 10:55:07 +1000
Subject: [PATCH] Update missing info for lgsm modules - jk3server

---
 lgsm/modules/command_check_update.sh | 2 ++
 lgsm/modules/command_start.sh        | 2 ++
 lgsm/modules/command_update.sh       | 2 ++
 lgsm/modules/core_getopt.sh          | 2 +-
 lgsm/modules/info_messages.sh        | 4 ----
 lgsm/modules/install_config.sh       | 1 -
 lgsm/modules/install_server_files.sh | 2 ++
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lgsm/modules/command_check_update.sh b/lgsm/modules/command_check_update.sh
index 2e6855f7c..4a2aaa551 100644
--- a/lgsm/modules/command_check_update.sh
+++ b/lgsm/modules/command_check_update.sh
@@ -28,6 +28,8 @@ elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
 	update_jk2.sh
+elif [ "${shortname}" == "jk3 "]; then
+	update_jk3.sh
 elif [ "${shortname}" == "vints" ]; then
 	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then
diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh
index f38125a5e..13f425c72 100644
--- a/lgsm/modules/command_start.sh
+++ b/lgsm/modules/command_start.sh
@@ -199,6 +199,8 @@ fi
 fn_print_dots "${servername}"
 if [ "${shortname}" == "jk2" ]; then
 	fn_start_jk2
+elif [ "${shortname}" == "jk3 "]; then
+	fn_start_jk3
 else
 	fn_start_tmux
 fi
diff --git a/lgsm/modules/command_update.sh b/lgsm/modules/command_update.sh
index e1fcec97f..d6f4ac0e1 100644
--- a/lgsm/modules/command_update.sh
+++ b/lgsm/modules/command_update.sh
@@ -29,6 +29,8 @@ elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
 	update_jk2.sh
+elif [ "${shortname}" == "jk3 " ]; then
+	update_jk3.sh
 elif [ "${shortname}" == "vints" ]; then
 	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then
diff --git a/lgsm/modules/core_getopt.sh b/lgsm/modules/core_getopt.sh
index cd3e57cb5..05f861097 100644
--- a/lgsm/modules/core_getopt.sh
+++ b/lgsm/modules/core_getopt.sh
@@ -66,7 +66,7 @@ currentopt=("${cmd_start[@]}" "${cmd_stop[@]}" "${cmd_restart[@]}" "${cmd_monito
 currentopt+=("${cmd_update_linuxgsm[@]}")
 
 # Exclude noupdate games here.
-if [ "${shortname}" == "jk2" ] || [ "${engine}" != "idtech3" ]; then
+if [ "${shortname}" == "jk2" ] || [ "${shortname}" == "jk3" ] || [ "${engine}" != "idtech3" ]; then
 	if [ "${shortname}" != "bf1942" ] && [ "${shortname}" != "bfv" ] && [ "${engine}" != "idtech2" ] && [ "${engine}" != "iw2.0" ] && [ "${engine}" != "iw3.0" ] && [ "${engine}" != "quake" ] && [ "${shortname}" != "samp" ] && [ "${shortname}" != "ut2k4" ]; then
 		currentopt+=("${cmd_update[@]}" "${cmd_check_update[@]}")
 		# force update for SteamCMD or Multi Theft Auto only.
diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh
index 98154e431..0d4a71c7f 100644
--- a/lgsm/modules/info_messages.sh
+++ b/lgsm/modules/info_messages.sh
@@ -1798,13 +1798,9 @@ fn_info_messages_select_engine() {
 	elif [ "${shortname}" == "jc3" ]; then
 		fn_info_messages_jc3
 	elif [ "${shortname}" == "jk2" ]; then
-<<<<<<< HEAD:lgsm/functions/info_messages.sh
 		fn_info_message_jk2
 	elif [ "${shortname}" == "jk3" ]; then
 		fn_info_message_jk3
-=======
-		fn_info_messages_jk2
->>>>>>> 1522cbd7b3d673aadf5b1a611cc03badf1f32b36:lgsm/modules/info_messages.sh
 	elif [ "${shortname}" == "kf" ]; then
 		fn_info_messages_kf
 	elif [ "${shortname}" == "kf2" ]; then
diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh
index c52c43aaa..295bb9cbc 100644
--- a/lgsm/modules/install_config.sh
+++ b/lgsm/modules/install_config.sh
@@ -666,7 +666,6 @@ elif [ "${shortname}" == "jk2" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 elif [ "${shortname}" == "jk3" ]; then
-	gamedirname="JediKnightJediAcademy"
 	array_configs+=( server.cfg )
 	fn_fetch_default_config
 	fn_default_config_remote
diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh
index c5fe822ad..f31009ef6 100644
--- a/lgsm/modules/install_server_files.sh
+++ b/lgsm/modules/install_server_files.sh
@@ -242,6 +242,8 @@ elif [ "${shortname}" == "fctr" ]; then
 	install_factorio_save.sh
 elif [ "${shortname}" == "jk2" ]; then
 	update_jk2.sh
+elif [ "${shortname}" == "jk3" ]; then
+	update_jk3.sh
 elif [ "${shortname}" == "vints" ]; then
 	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then