From dfcbfbdfda1f3f33af3c475212c706d47dda9dd8 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 2 Sep 2020 21:28:37 +0100
Subject: [PATCH] changes

---
 lgsm/functions/check_ip.sh              |  2 +-
 lgsm/functions/command_dev_query_raw.sh | 85 ++++++++++++++-----------
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh
index 3bf544827..464d75e1a 100644
--- a/lgsm/functions/check_ip.sh
+++ b/lgsm/functions/check_ip.sh
@@ -25,7 +25,7 @@ if [ "${ip}" != "0.0.0.0" ]&&[ "${ip}" != "" ]; then
 	queryips=( "${ip}" )
 # If ip is not set by user
 else
-	queryips=( "${getip}" )
+	queryips=( $(echo "${getip}") )
 fi
 
 echo "###### DEV IP CHECK ######"
diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh
index 389317db2..a66dbba4a 100644
--- a/lgsm/functions/command_dev_query_raw.sh
+++ b/lgsm/functions/command_dev_query_raw.sh
@@ -14,14 +14,16 @@ info_config.sh
 info_parms.sh
 
 
-for queryip in "${queryips[@]}"
-do
+
 	echo -e ""
 	echo -e "Query Port - Raw Output"
 	echo -e "=================================================================="
 	echo -e ""
 	echo -e "QUERY IP"
-	echo -e "${queryip}"
+	for queryip in "${queryips[@]}"
+	do
+		echo -e "${queryip}"
+	done
 	echo -e "================================="
 	echo -e "Ports"
 	echo -e "================================="
@@ -38,38 +40,43 @@ do
 	if [ ! "$(command -v jq 2>/dev/null)" ]; then
 		fn_print_failure_nl "jq not installed"
 	fi
-
-	query_gamedig.sh
-	echo -e "${gamedigcmd}"
-	echo""
-	echo "${gamedigraw}" | jq
-
+	for queryip in "${queryips[@]}"
+	do
+		query_gamedig.sh
+		echo -e "${gamedigcmd}"
+		echo""
+		echo "${gamedigraw}" | jq
+	done
 	echo -e ""
 	echo -e "gsquery Raw Output"
 	echo -e "================================="
 	echo -e ""
-	echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\""
-	echo -e ""
-	if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
-		fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5"
-	fi
-	"${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}"
-
+	for queryip in "${queryips[@]}"
+	do
+		echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\""
+		echo -e ""
+		if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
+			fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5"
+		fi
+		"${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}"
+	done
 	echo -e ""
 	echo -e "TCP Raw Output"
 	echo -e "================================="
 	echo -e ""
-	echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''"
-	echo -e ""
-	timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''
-	querystatus="$?"
-	echo -e ""
-	if [ "${querystatus}" == "0" ]; then
-		echo -e "TCP query PASS"
-	else
-		echo -e "TCP query FAIL"
-	fi
-
+	for queryip in "${queryips[@]}"
+	do
+		echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''"
+		echo -e ""
+		timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''
+		querystatus="$?"
+		echo -e ""
+		if [ "${querystatus}" == "0" ]; then
+			echo -e "TCP query PASS"
+		else
+			echo -e "TCP query FAIL"
+		fi
+	done
 	echo -e ""
 	echo -e "Game Port - Raw Output"
 	echo -e "=================================================================="
@@ -77,16 +84,18 @@ do
 	echo -e "TCP Raw Output"
 	echo -e "================================="
 	echo -e ""
-	echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''"
-	echo -e ""
-	timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''
-	querystatus="$?"
-	echo -e ""
-	if [ "${querystatus}" == "0" ]; then
-		echo -e "TCP query PASS"
-	else
-		echo -e "TCP query FAIL"
-	fi
-done
+	for queryip in "${queryips[@]}"
+	do
+		echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''"
+		echo -e ""
+		timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''
+		querystatus="$?"
+		echo -e ""
+		if [ "${querystatus}" == "0" ]; then
+			echo -e "TCP query PASS"
+		else
+			echo -e "TCP query FAIL"
+		fi
+	done
 exitcode=0
 core_exit.sh