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

Merge branch 'hotfix/v23.5.1' into develop

Daniel Gibbs 2 лет назад
Родитель
Сommit
a7330b81d0

+ 1 - 1
.github/workflows/details-check.yml

@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Generate matrix with generate-matrix.sh
         run: chmod +x .github/workflows/detals-check-generate-matrix.sh; .github/workflows/detals-check-generate-matrix.sh

+ 1 - 1
.github/workflows/serverlist-validate.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Compare Versions
         run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh

+ 1 - 1
.github/workflows/update-copyright-years-in-license-file.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Action Update License Year

+ 1 - 1
.github/workflows/version-check.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Version Check
         run: chmod +x .github/workflows/version-check.sh; .github/workflows/version-check.sh

+ 0 - 0
lgsm/config-default/config-lgsm/pstbsserver/_default.cfg → lgsm/config-default/config-lgsm/psserver/_default.cfg


+ 1 - 1
lgsm/modules/core_functions.sh

@@ -8,7 +8,7 @@
 
 module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v23.5.0"
+modulesversion="v23.5.1"
 
 # Core
 

+ 1 - 1
lgsm/modules/core_modules.sh

@@ -8,7 +8,7 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v23.5.0"
+modulesversion="v23.5.1"
 
 # Core
 

+ 5 - 5
lgsm/modules/info_game.sh

@@ -2060,11 +2060,11 @@ fn_info_game_terraria() {
 # Filetype: cfg
 fn_info_game_tw() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_quakec "servername" "sv_name"
-		fn_info_game_quakec "serverpassword" "password"
-		fn_info_game_quakec "rconpassword" "sv_rcon_password"
-		fn_info_game_quakec "port" "sv_port"
-		fn_info_game_quakec "maxplayers" "sv_max_clients"
+		fn_info_game_keyvalue_pairs_space "servername" "sv_name"
+		fn_info_game_keyvalue_pairs_space "serverpassword" "password"
+		fn_info_game_keyvalue_pairs_space "rconpassword" "sv_rcon_password"
+		fn_info_game_keyvalue_pairs_space "port" "sv_port"
+		fn_info_game_keyvalue_pairs_space "maxplayers" "sv_max_clients"
 	fi
 	queryport="${port}"
 	servername="${servername:-"NOT SET"}"

+ 1 - 1
linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.5.0"
+version="v23.5.1"
 shortname="core"
 gameservername="core"
 commandname="CORE"

+ 1 - 1
tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.5.0"
+version="v23.5.1"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

+ 1 - 1
tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.5.0"
+version="v23.5.1"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

+ 1 - 1
tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.5.0"
+version="v23.5.1"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

+ 1 - 1
tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.5.0"
+version="v23.5.1"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"