Skip to content

Commit c23b067

Browse files
committed
Merge branch 'hotfix/v23.7.1' into develop
2 parents ddd3056 + f1b3bb7 commit c23b067

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Lock Threads
15-
uses: dessant/lock-threads@v4
15+
uses: dessant/lock-threads@v5
1616
with:
1717
github-token: ${{ secrets.GITHUB_TOKEN }}
1818
issue-comment: >

lgsm/modules/check_system_requirements.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363

6464
# If the game or engine has a minimum RAM Requirement, compare it to system's available RAM.
6565
if [ "${ramrequirementgb}" ]; then
66-
if [ "${physmemtotalgb}" -lt "${ramrequirementgb}" ]; then
66+
if (($(echo "${physmemtotalgb} < ${ramrequirementgb}" | bc -l))); then
6767
fn_print_dots "Checking RAM"
6868
fn_print_warn_nl "Checking RAM: ${ramrequirementgb}G required, ${physmemtotal} available"
6969
echo "* ${gamename} server may fail to run or experience poor performance."

lgsm/modules/core_modules.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v23.7.0"
11+
modulesversion="v23.7.1"
1212

1313
# Core
1414

lgsm/modules/info_distro.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,16 @@ else
195195
else
196196
humanreadable="-h"
197197
fi
198-
physmemtotalmb="$(free -m | awk '/Mem:/ {print $2}')" # string
198+
physmemtotalmb="$(free -m | awk '/Mem:/ {print $2}')" # integer
199+
physmemtotalgb="$(free -m | awk '/Mem:/ {print $2}')" # integer
199200
physmemtotal="$(free ${humanreadable} | awk '/Mem:/ {print $2}')" # string
200201
physmemfree="$(free ${humanreadable} | awk '/Mem:/ {print $4}')" # string
201202
physmemused="$(free ${humanreadable} | awk '/Mem:/ {print $3}')" # string
202203

203204
oldfree="$(free ${humanreadable} | awk '/cache:/')"
204205
if [ "${oldfree}" ]; then
205-
physmemavailable="n/a"
206-
physmemcached="n/a"
206+
physmemavailable="n/a" # string
207+
physmemcached="n/a" # string
207208
else
208209
physmemavailable="$(free ${humanreadable} | awk '/Mem:/ {print $7}')" # string
209210
physmemcached="$(free ${humanreadable} | awk '/Mem:/ {print $6}')" # string

linuxgsm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
2424
set -x
2525
fi
2626

27-
version="v23.7.0"
27+
version="v23.7.1"
2828
shortname="core"
2929
gameservername="core"
3030
commandname="CORE"

0 commit comments

Comments
 (0)