mirror of
https://github.com/GameServerManagers/LinuxGSM.git
synced 2025-01-08 12:07:37 +08:00
Merge branch 'hotfix/v23.7.1' into develop
This commit is contained in:
commit
c23b067951
2
.github/workflows/lock.yml
vendored
2
.github/workflows/lock.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Lock Threads
|
||||
uses: dessant/lock-threads@v4
|
||||
uses: dessant/lock-threads@v5
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
issue-comment: >
|
||||
|
@ -63,7 +63,7 @@ fi
|
||||
|
||||
# If the game or engine has a minimum RAM Requirement, compare it to system's available RAM.
|
||||
if [ "${ramrequirementgb}" ]; then
|
||||
if [ "${physmemtotalgb}" -lt "${ramrequirementgb}" ]; then
|
||||
if (($(echo "${physmemtotalgb} < ${ramrequirementgb}" | bc -l))); then
|
||||
fn_print_dots "Checking RAM"
|
||||
fn_print_warn_nl "Checking RAM: ${ramrequirementgb}G required, ${physmemtotal} available"
|
||||
echo "* ${gamename} server may fail to run or experience poor performance."
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
|
||||
|
||||
modulesversion="v23.7.0"
|
||||
modulesversion="v23.7.1"
|
||||
|
||||
# Core
|
||||
|
||||
|
@ -195,15 +195,16 @@ else
|
||||
else
|
||||
humanreadable="-h"
|
||||
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
|
||||
physmemfree="$(free ${humanreadable} | awk '/Mem:/ {print $4}')" # string
|
||||
physmemused="$(free ${humanreadable} | awk '/Mem:/ {print $3}')" # string
|
||||
|
||||
oldfree="$(free ${humanreadable} | awk '/cache:/')"
|
||||
if [ "${oldfree}" ]; then
|
||||
physmemavailable="n/a"
|
||||
physmemcached="n/a"
|
||||
physmemavailable="n/a" # string
|
||||
physmemcached="n/a" # string
|
||||
else
|
||||
physmemavailable="$(free ${humanreadable} | awk '/Mem:/ {print $7}')" # string
|
||||
physmemcached="$(free ${humanreadable} | awk '/Mem:/ {print $6}')" # string
|
||||
|
@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
version="v23.7.0"
|
||||
version="v23.7.1"
|
||||
shortname="core"
|
||||
gameservername="core"
|
||||
commandname="CORE"
|
||||
|
Loading…
Reference in New Issue
Block a user