refactor: improve code readability and efficiency in command_dev_query_raw.sh

- Simplify conditionals by replacing [ -v var ] with [ -n "${var}" ] - Remove unnecessary checks for the presence of jq and gamedig - Update output headers to be more descriptive and consistent - Use italic formatting for curl command in Steam Master Server Response section
2 years ago · 07a1eefe7f
1 changed files with 30 additions and 42 deletions
--- a/lgsm/modules/command_dev_query_raw.sh
+++ b/lgsm/modules/command_dev_query_raw.sh
@ -27,13 +27,13 @@ echo -e "${bold}${lightyellow}Game Server Ports${default}"
 fn_messages_separator
 {
 	echo -e "${lightblue}Port Name \tPort Number \tStatus \tTCP \tUDP${default}"
-	if [ -v port ]; then
+	if [ -n "${port}" ]; then
 		echo -e "Game: \t${port} \t$(ss -tupl | grep -c "${port}") \t$(ss -tupl | grep "${port}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${port}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Game:"
 	fi
 	if [ "${shortname}" == "pvr" ]; then
-		if [ -v port401 ]; then
+		if [ -n "${port401}" ]; then
 			echo -e "Game+400: \t${port401} \t$(ss -tupl | grep -c "${port401}") \t$(ss -tupl | grep "${port401}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${port401}" | grep udp | awk '{ print $2 }')"
 		else
 			echo -e "Game+400:"
@ -41,140 +41,140 @@ fn_messages_separator
 	fi

 	if [ "${shortname}" == "mcb" ]; then
-		if [ -v portipv6 ]; then
+		if [ -n "${portipv6}" ]; then
 			echo -e "Game ipv6: \t${portipv6} \t$(ss -tupl | grep -c "${portipv6}") \t$(ss -tupl | grep "${portipv6}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${portipv6}" | grep udp | awk '{ print $2 }')"
 		else
 			echo -e "Game ipv6:"
 		fi
 	fi

-	if [ -v queryport ]; then
+	if [ -n "${queryport}" ]; then
 		echo -e "Query: \t${queryport} \t$(ss -tupl | grep -c "${queryport}") \t$(ss -tupl | grep "${queryport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${queryport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Query:"
 	fi

-	if [ -v apiport ]; then
+	if [ -n "${apiport}" ]; then
 		echo -e "Game: \t${apiport} \t$(ss -tupl | grep -c "${apiport}") \t$(ss -tupl | grep "${apiport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${apiport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "API:"
 	fi

-	if [ -v appport ]; then
+	if [ -n "${appport}" ]; then
 		echo -e "App: \t${appport} \t$(ss -tupl | grep -c "${appport}") \t$(ss -tupl | grep "${appport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${appport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "App:"
 	fi

-	if [ -v battleeyeport ]; then
+	if [ -n "${battleeyeport}" ]; then
 		echo -e "BattleEye: \t${battleeyeport} \t$(ss -tupl | grep -c "${battleeyeport}") \t$(ss -tupl | grep "${battleeyeport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${battleeyeport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "BattleEye:"
 	fi

-	if [ -v beaconport ]; then
+	if [ -n "${beaconport}" ]; then
 		echo -e "Beacon: \t${beaconport} \t$(ss -tupl | grep -c "${beaconport}") \t$(ss -tupl | grep "${beaconport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${beaconport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Beacon:"
 	fi

-	if [ -v clientport ]; then
+	if [ -n "${clientport}" ]; then
 		echo -e "Client: \t${clientport} \t$(ss -tupl | grep -c "${clientport}") \t$(ss -tupl | grep "${clientport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${clientport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Client:"
 	fi

-	if [ -v fileport ]; then
+	if [ -n "${fileport}" ]; then
 		echo -e "File: \t${fileport} \t$(ss -tupl | grep -c "${fileport}") \t$(ss -tupl | grep "${fileport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${fileport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "File:"
 	fi

-	if [ -v httpport ]; then
+	if [ -n "${httpport}" ]; then
 		echo -e "HTTP: \t${httpport} \t$(ss -tupl | grep -c "${httpport}") \t$(ss -tupl | grep "${httpport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${httpport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "HTTP:"
 	fi

-	if [ -v httpqueryport ]; then
+	if [ -n "${httpqueryport}" ]; then
 		echo -e "HTTP Query: \t${httpqueryport} \t$(ss -tupl | grep -c "${httpqueryport}") \t$(ss -tupl | grep" ${httpqueryport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${httpqueryport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "HTTP Query:"
 	fi

-	if [ -v httpport ]; then
+	if [ -n "${httpport}" ]; then
 		echo -e "Web Interface: \t${httpport} \t$(ss -tupl | grep -c "${httpport}") \t$(ss -tupl | grep "${httpport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${httpport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Web Interface:"
 	fi

-	if [ -v masterport ]; then
+	if [ -n "${masterport}" ]; then
 		echo -e "Game: Master: \t${masterport} \t$(ss -tupl | grep -c "${masterport}") \t$(ss -tupl | grep "${masterport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${masterport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Game: Master:"
 	fi

-	if [ -v rawport ]; then
+	if [ -n "${rawport}" ]; then
 		echo -e "RAW UDP Socket: \t${rawport} \t$(ss -tupl | grep -c "${rawport}") \t$(ss -tupl | grep "${rawport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${rawport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "RAW UDP Socket:"
 	fi

-	if [ -v rconport ]; then
+	if [ -n "${rconport}" ]; then
 		echo -e "RCON: \t${rconport} \t$(ss -tupl | grep -c "${rconport}") \t$(ss -tupl | grep "${rconport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${rconport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "RCON:"
 	fi

-	if [ -v steamport ]; then
+	if [ -n "${steamport}" ]; then
 		echo -e "Steam: \t${steamport} \t$(ss -tupl | grep -c "${steamport}") \t$(ss -tupl | grep "${steamport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${steamport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Steam:"
 	fi

-	if [ -v steamworksport ]; then
+	if [ -n "${steamworksport}" ]; then
 		echo -e "Steamworks P2P: \t${steamworksport} \t$(ss -tupl | grep -c "${steamworksport}") \t$(ss -tupl | grep "${steamworksport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${steamworksport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Steamworks P2P:"
 	fi

-	if [ -v steamauthport ]; then
+	if [ -n "${steamauthport}" ]; then
 		echo -e "Steam: Auth: \t${steamauthport} \t$(ss -tupl | grep -c "${steamauthport}") \t$(ss -tupl | grep "${steamauthport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${steamauthport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Steam: Auth:"
 	fi

-	if [ -v telnetport ]; then
+	if [ -n "${telnetport}" ]; then
 		echo -e "Telnet: \t${telnetport} \t$(ss -tupl | grep -c "${telnetport}") \t$(ss -tupl | grep "${telnetport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${telnetport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Telnet:"
 	fi

-	if [ -v statsport ]; then
+	if [ -n "${statsport}" ]; then
 		echo -e "Stats: \t${battleeyeport} \t$(ss -tupl | grep -c "${statsport}") \t$(ss -tupl | grep "${statsport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${statsport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Stats:"
 	fi

-	if [ -v sourcetvport ]; then
+	if [ -n "${sourcetvport}" ]; then
 		echo -e "SourceTV: \t${sourcetvport} \t$(ss -tupl | grep -c "${sourcetvport}") \t$(ss -tupl | grep "${sourcetvport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${sourcetvport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "SourceTV:"
 	fi

-	if [ -v udplinkport ]; then
+	if [ -n "${udplinkport}" ]; then
 		echo -e "UDP Link: \t${udplinkport} \t$(ss -tupl | grep -c "${udplinkport}") \t$(ss -tupl | grep "${udplinkport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${udplinkport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "UDP Link:"
 	fi

-	if [ -v voiceport ]; then
+	if [ -n "${voiceport}" ]; then
 		echo -e "Voice: \t${voiceport} \t$(ss -tupl | grep -c "${voiceport}") \t$(ss -tupl | grep "${voiceport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${voiceport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Voice:"
 	fi

-	if [ -v voiceunusedport ]; then
+	if [ -n "${voiceunusedport}" ]; then
 		echo -e "Voice (Unused): \t${voiceunusedport} \t$(ss -tupl | grep -c "${voiceunusedport}") \t$(ss -tupl | grep "${voiceunusedport}" | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep "${voiceunusedport}" | grep udp | awk '{ print $2 }')"
 	else
 		echo -e "Voice (Unused):"
@ -188,21 +188,12 @@ fn_messages_separator
 fn_info_message_ports
 eval "${portcommand}"
 echo -e ""
-echo -e "${bold}${lightyellow}Query Port - Raw Output${default}"
-fn_messages_separator
-echo -e ""
-echo -e "PORT: ${port}"
-echo -e "QUERY PORT: ${queryport}"
-echo -e ""
-echo -e "${bold}${lightyellow}Gamedig Raw Output${default}"
+echo -e "${bold}${lightyellow}Query Port (${queryport}) - Gamedig Output${default}"
 fn_messages_separator
 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
-	fn_print_failure_nl "jq not installed"
-fi
 for queryip in "${queryips[@]}"; do
 	query_gamedig.sh
 	echo -e "${gamedigcmd}"
@ -210,7 +201,7 @@ for queryip in "${queryips[@]}"; do
 	echo "${gamedigraw}" | jq
 done
 echo -e ""
-echo -e "${bold}${lightyellow}gsquery Raw Output${default}"
+echo -e "${bold}${lightyellow}Query Port (${queryport}) - gsquery Output${default}"
 fn_messages_separator
 echo -e ""
 for queryip in "${queryips[@]}"; do
@ -222,7 +213,7 @@ for queryip in "${queryips[@]}"; do
 	"${modulesdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}"
 done
 echo -e ""
-echo -e "${bold}${lightyellow}TCP Raw Output${default}"
+echo -e "${bold}${lightyellow}Query Port (${queryport}) - TCP Output${default}"
 fn_messages_separator
 echo -e ""
 for queryip in "${queryips[@]}"; do
@ -238,10 +229,7 @@ for queryip in "${queryips[@]}"; do
 	fi
 done
 echo -e ""
-echo -e "${bold}${lightyellow}Game Port - Raw Output${default}"
-fn_messages_separator
-echo -e ""
-echo -e "${bold}${lightyellow}TCP Raw Output${default}"
+echo -e "${bold}${lightyellow}Game Port (${port}) - TCP Output${default}"
 fn_messages_separator
 echo -e ""
 for queryip in "${queryips[@]}"; do
@ -260,7 +248,7 @@ echo -e ""
 echo -e "${bold}${lightyellow}Steam Master Server Response${default}"
 fn_messages_separator
 echo -e ""
-echo -e "curl -m 3 -s https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${publicip}"
+echo -e "${italic}curl -m 3 -s https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${publicip}${default}"
 echo -e ""
 echo -e "Response: ${displaymasterserver}"
 echo -e ""