From fd3a5f39c79609cfbccc3d810a4a4f768cb07991 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 3 Apr 2023 23:48:06 +0100
Subject: [PATCH]  fix merge bugs

a
---
 .github/workflows/version-check.sh            |  7 +------
 lgsm/modules/README.md                        | 14 -------------
 lgsm/modules/command_monitor.sh               | 20 +++++++------------
 lgsm/{functions => modules}/core_functions.sh |  0
 lgsm/{functions => modules}/fix_armar.sh      |  0
 lgsm/{functions => modules}/fix_bt.sh         |  0
 lgsm/{functions => modules}/update_ut99.sh    |  0
 7 files changed, 8 insertions(+), 33 deletions(-)
 rename lgsm/{functions => modules}/core_functions.sh (100%)
 rename lgsm/{functions => modules}/fix_armar.sh (100%)
 rename lgsm/{functions => modules}/fix_bt.sh (100%)
 rename lgsm/{functions => modules}/update_ut99.sh (100%)

diff --git a/.github/workflows/version-check.sh b/.github/workflows/version-check.sh
index 050f7ed02..a5f21c5cb 100644
--- a/.github/workflows/version-check.sh
+++ b/.github/workflows/version-check.sh
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
-version=$(grep "version=" linuxgsm.sh | sed -e 's/version//g'| tr -d '="')
-modulesversion=$(grep "modulesversion=" lgsm/modules/core_modules.sh | sed -e 's/modulesversion//g'| tr -d '="')
-=======
 #!/bin/bash
 version=$(grep "version=" linuxgsm.sh | sed -e 's/version//g' | tr -d '="')
-modulesversion=$(grep "modulesversion=" lgsm/functions/core_functions.sh | sed -e 's/modulesversion//g' | tr -d '="')
->>>>>>> develop
+modulesversion=$(grep "modulesversion=" lgsm/modules/core_modules.sh | sed -e 's/modulesversion//g' | tr -d '="')
 
 if [ "${version}" != "${modulesversion}" ]; then
 	echo "Error! LinuxGSM version mismatch"
diff --git a/lgsm/modules/README.md b/lgsm/modules/README.md
index f506fb4fb..de008ecfa 100644
--- a/lgsm/modules/README.md
+++ b/lgsm/modules/README.md
@@ -3,19 +3,6 @@
 These modules are scripts that are called upon by the primary script linuxgsm.sh
 
 ## Module Names
-<<<<<<< HEAD:lgsm/modules/README.md
-Modules have been named to give an idea of what the module does.
-
-* core: Essential modules that will always run first.
-* command: Primary command module.
-* check: Runs checks that will either halt on or fix an issue.
-* dev: development modules.
-* fix: Applies a game server specific fix.
-* info: retrieves information from a source such as config file or the OS.
-* install: modules related to the installer.
-* monitor: modules related to monitor.
-* update: modules that update the game server.
-=======
 
 Modules have been named to give an idea of what the function does.
 
@@ -28,4 +15,3 @@ Modules have been named to give an idea of what the function does.
 -   install: modules related to the installer.
 -   monitor: modules related to monitor.
 -   update: modules that update the game server.
->>>>>>> develop:lgsm/functions/README.md
diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index 8142251bb..1b764c612 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -26,9 +26,9 @@ fn_monitor_check_lockfile() {
 
 	# Fix if lockfile is not unix time or contains letters
 	if [ -f "${lockdir}/${selfname}.lock" ] && [[ "$(head -n 1 "${lockdir}/${selfname}.lock")" =~ [A-Za-z] ]]; then
-		date '+%s' > "${lockdir}/${selfname}.lock"
-		echo "${version}" >> "${lockdir}/${selfname}.lock"
-		echo "${port}" >> "${lockdir}/${selfname}.lock"
+		date '+%s' >"${lockdir}/${selfname}.lock"
+		echo "${version}" >>"${lockdir}/${selfname}.lock"
+		echo "${port}" >>"${lockdir}/${selfname}.lock"
 	fi
 }
 
@@ -83,22 +83,16 @@ fn_monitor_check_queryport() {
 	fi
 }
 
-<<<<<<< HEAD:lgsm/modules/command_monitor.sh
-fn_query_gsquery(){
+fn_query_gsquery() {
 	if [ ! -f "${modulesdir}/query_gsquery.py" ]; then
 		fn_fetch_file_github "lgsm/modules" "query_gsquery.py" "${modulesdir}" "chmodx" "norun" "noforce" "nohash"
-=======
-fn_query_gsquery() {
-	if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
-		fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nohash"
->>>>>>> develop:lgsm/functions/command_monitor.sh
 	fi
-	"${modulesdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" > /dev/null 2>&1
+	"${modulesdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" >/dev/null 2>&1
 	querystatus="$?"
 }
 
 fn_query_tcp() {
-	bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}'' > /dev/null 2>&1
+	bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}'' >/dev/null 2>&1
 	querystatus="$?"
 }
 
@@ -211,7 +205,7 @@ fn_monitor_loop() {
 	for querymethod in "${query_methods_array[@]}"; do
 		# Will check if gamedig is installed and bypass if not.
 		if [ "${querymethod}" == "gamedig" ]; then
-			if [ "$(command -v gamedig 2> /dev/null)" ] && [ "$(command -v jq 2> /dev/null)" ]; then
+			if [ "$(command -v gamedig 2>/dev/null)" ] && [ "$(command -v jq 2>/dev/null)" ]; then
 				if [ -z "${monitorpass}" ]; then
 					fn_monitor_query
 				fi
diff --git a/lgsm/functions/core_functions.sh b/lgsm/modules/core_functions.sh
similarity index 100%
rename from lgsm/functions/core_functions.sh
rename to lgsm/modules/core_functions.sh
diff --git a/lgsm/functions/fix_armar.sh b/lgsm/modules/fix_armar.sh
similarity index 100%
rename from lgsm/functions/fix_armar.sh
rename to lgsm/modules/fix_armar.sh
diff --git a/lgsm/functions/fix_bt.sh b/lgsm/modules/fix_bt.sh
similarity index 100%
rename from lgsm/functions/fix_bt.sh
rename to lgsm/modules/fix_bt.sh
diff --git a/lgsm/functions/update_ut99.sh b/lgsm/modules/update_ut99.sh
similarity index 100%
rename from lgsm/functions/update_ut99.sh
rename to lgsm/modules/update_ut99.sh