Просмотр исходного кода

fix: repair Starbound details

This commit updates the info_game.sh file by changing the servercfgfullpath variable to servercfgparse in line 96. It also modifies the fn_info_game_sb function to check if the server config file exists before parsing it, and changes the JSON keys in lines 1828-1836 from camelCase to dot notation.
Daniel Gibbs 3 лет назад
Родитель
Сommit
ba7c795b51
1 измененных файлов с 10 добавлено и 10 удалено
  1. 10 10
      lgsm/modules/info_game.sh

+ 10 - 10
lgsm/modules/info_game.sh

@@ -93,7 +93,7 @@ fn_info_game_json() {
 	else
 	else
 		servercfgparse="${servercfgfullpath}"
 		servercfgparse="${servercfgfullpath}"
 	fi
 	fi
-	eval "${1}=\"$(jq -r "${2}" "${servercfgfullpath}")\""
+	eval "${1}=\"$(jq -r "${2}" "${servercfgparse}")\""
 	configtype="json"
 	configtype="json"
 }
 }
 
 
@@ -1826,15 +1826,15 @@ fn_info_game_samp() {
 # Parameters: false
 # Parameters: false
 # Comment: // or /* */
 # Comment: // or /* */
 fn_info_game_sb() {
 fn_info_game_sb() {
-	if [ ! -f "${servercfgfullpath}" ]; then
-		fn_info_game_json "maxplayers" "maxPlayers"
-		fn_info_game_json "port" "gameServerPort"
-		fn_info_game_json "queryenabled" "runQueryServer"
-		fn_info_game_json "queryport" "queryServerPort"
-		fn_info_game_json "rconenabled" "runRconServer"
-		fn_info_game_json "rconpassword" "rconServerPassword"
-		fn_info_game_json "rconport" "rconServerPort"
-		fn_info_game_json "servername" "serverName"
+	if [ -f "${servercfgfullpath}" ]; then
+		fn_info_game_json "maxplayers" ".maxPlayers"
+		fn_info_game_json "port" ".gameServerPort"
+		fn_info_game_json "queryenabled" ".runQueryServer"
+		fn_info_game_json "queryport" ".queryServerPort"
+		fn_info_game_json "rconenabled" ".runRconServer"
+		fn_info_game_json "rconpassword" ".rconServerPassword"
+		fn_info_game_json "rconport" ".rconServerPort"
+		fn_info_game_json "servername" ".serverName"
 	fi
 	fi
 	maxplayers="${maxplayers:-"0"}"
 	maxplayers="${maxplayers:-"0"}"
 	port="${port:-"0"}"
 	port="${port:-"0"}"