remove default

lgsm/functions/command_dev_query_raw.sh

@@ -13,59 +13,57 @@ check.sh
 info_config.sh
 info_parms.sh
 
-
-
-	echo -e ""
-	echo -e "Query Port - Raw Output"
-	echo -e "=================================================================="
-	echo -e ""
-	echo -e "QUERY IP"
-	for queryip in "${queryips[@]}"
-	do
+echo -e ""
+echo -e "Query Port - Raw Output"
+echo -e "=================================================================="
+echo -e ""
+echo -e "QUERY IP"
+for queryip in "${queryips[@]}"
+do
 	echo -e "${queryip}"
-	done
-	echo -e "================================="
-	echo -e "Ports"
-	echo -e "================================="
-	echo -e ""
-	echo -e "PORT: ${port}"
-	echo -e "QUERY PORT: ${queryport}"
-	echo -e ""
-	echo -e "Gamedig Raw Output"
-	echo -e "================================="
-	echo -e ""
-	if [ ! "$(command -v gamedig 2>/dev/null)" ]; then
+done
+echo -e "================================="
+echo -e "Ports"
+echo -e "================================="
+echo -e ""
+echo -e "PORT: ${port}"
+echo -e "QUERY PORT: ${queryport}"
+echo -e ""
+echo -e "Gamedig Raw Output"
+echo -e "================================="
+echo -e ""
+if [ ! "$(command -v gamedig 2>/dev/null)" ]; then
 	fn_print_failure_nl "gamedig not installed"
-	fi
-	if [ ! "$(command -v jq 2>/dev/null)" ]; then
+fi
+if [ ! "$(command -v jq 2>/dev/null)" ]; then
 	fn_print_failure_nl "jq not installed"
-	fi
-	for queryip in "${queryips[@]}"
-	do
+fi
+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 ""
-	for queryip in "${queryips[@]}"
-	do
+done
+echo -e ""
+echo -e "gsquery Raw Output"
+echo -e "================================="
+echo -e ""
+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 ""
-	for queryip in "${queryips[@]}"
-	do
+done
+echo -e ""
+echo -e "TCP Raw Output"
+echo -e "================================="
+echo -e ""
+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}''
@@ -76,16 +74,16 @@ info_parms.sh
 	else
 		echo -e "TCP query FAIL"
 	fi
-	done
-	echo -e ""
-	echo -e "Game Port - Raw Output"
-	echo -e "=================================================================="
-	echo -e ""
-	echo -e "TCP Raw Output"
-	echo -e "================================="
-	echo -e ""
-	for queryip in "${queryips[@]}"
-	do
+done
+echo -e ""
+echo -e "Game Port - Raw Output"
+echo -e "=================================================================="
+echo -e ""
+echo -e "TCP Raw Output"
+echo -e "================================="
+echo -e ""
+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}''
@@ -96,6 +94,6 @@ info_parms.sh
 	else
 		echo -e "TCP query FAIL"
 	fi
-	done
+done
 exitcode=0
 core_exit.sh

lgsm/functions/command_monitor.sh

@@ -99,6 +99,8 @@ fn_monitor_query(){
 # Query will wait up to 60 seconds to confirm server is down as server can become non-responsive during map changes.
 totalseconds=0
 for queryattempt in {1..5}; do
+	for queryip in "${queryips[@]}"
+	do
 		fn_print_dots "Querying port: ${querymethod}: ${queryip}:${queryport} : ${totalseconds}/${queryattempt}: "
 		fn_print_querying_eol
 		fn_script_log_info "Querying port: ${querymethod}: ${queryip}:${queryport} : ${queryattempt} : QUERYING"
@@ -180,7 +182,8 @@ for queryattempt in {1..5}; do
 					break
 				fi
 			fi
-
+		fi
+		done
 		# Second counter will wait for 15s before breaking loop.
 		for seconds in {1..15}; do
 			fn_print_fail "Querying port: ${querymethod}: ${queryip}:${queryport} : ${totalseconds}/${queryattempt}: ${cyan}WAIT${default}"
@@ -190,7 +193,7 @@ for queryattempt in {1..5}; do
 				break
 			fi
 		done
-	fi
+
 done
 }