Windy/LinuxGSM
1
0
Fork 0
mirror of https://github.com/GameServerManagers/LinuxGSM.git synced 2025-01-09 04:27:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v23.7.1' into develop

Browse Source
This commit is contained in:
Daniel Gibbs 2023-12-10 20:04:32 +00:00
commit c23b067951
No known key found for this signature in database
GPG Key ID: 2076B128385E8C55
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lock.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Lock Threads - name: Lock Threads
uses: dessant/lock-threads@v4 uses: dessant/lock-threads@v5
with: with:
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
issue-comment: > issue-comment: >

2
lgsm/modules/check_system_requirements.sh
View File

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

2
lgsm/modules/core_modules.sh
View File

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

7
lgsm/modules/info_distro.sh
View File

@ -195,15 +195,16 @@ else
else else
humanreadable="-h" humanreadable="-h"
fi fi
physmemtotalmb="$(free -m | awk '/Mem:/ {print $2}')" # string physmemtotalmb="$(free -m | awk '/Mem:/ {print $2}')" # integer
physmemtotalgb="$(free -m | awk '/Mem:/ {print $2}')" # integer
physmemtotal="$(free ${humanreadable} | awk '/Mem:/ {print $2}')" # string physmemtotal="$(free ${humanreadable} | awk '/Mem:/ {print $2}')" # string
physmemfree="$(free ${humanreadable} | awk '/Mem:/ {print $4}')" # string physmemfree="$(free ${humanreadable} | awk '/Mem:/ {print $4}')" # string
physmemused="$(free ${humanreadable} | awk '/Mem:/ {print $3}')" # string physmemused="$(free ${humanreadable} | awk '/Mem:/ {print $3}')" # string
oldfree="$(free ${humanreadable} | awk '/cache:/')" oldfree="$(free ${humanreadable} | awk '/cache:/')"
if [ "${oldfree}" ]; then if [ "${oldfree}" ]; then
physmemavailable="n/a" physmemavailable="n/a" # string
physmemcached="n/a" physmemcached="n/a" # string
else else
physmemavailable="$(free ${humanreadable} | awk '/Mem:/ {print $7}')" # string physmemavailable="$(free ${humanreadable} | awk '/Mem:/ {print $7}')" # string
physmemcached="$(free ${humanreadable} | awk '/Mem:/ {print $6}')" # string physmemcached="$(free ${humanreadable} | awk '/Mem:/ {print $6}')" # string

2
linuxgsm.sh
View File

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