From 4b4c55948ead55ffdc54fb3bee68b95977cf49ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Dec 2023 20:33:21 +0000 Subject: [PATCH 1/3] build(deps): bump dessant/lock-threads from 4 to 5 (#4380) Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 4 to 5. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md) - [Commits](https://github.com/dessant/lock-threads/compare/v4...v5) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Gibbs --- .github/workflows/lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 4883914f8..a4fdbf547 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -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: > From 10b6807edcbb666b94f41cbfc62e7d9ec323fb09 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 10 Dec 2023 20:02:05 +0000 Subject: [PATCH 2/3] fix: system requirements bug (#4407) * fix: added missing variable physmemtotalgb * fix: compare RAM requirement to system's available RAM allow numbers with decimal points to be compared --- lgsm/modules/check_system_requirements.sh | 2 +- lgsm/modules/info_distro.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lgsm/modules/check_system_requirements.sh b/lgsm/modules/check_system_requirements.sh index 5ffd0c8af..0214cdc1a 100644 --- a/lgsm/modules/check_system_requirements.sh +++ b/lgsm/modules/check_system_requirements.sh @@ -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." diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh index cb832a87b..a4e3521f8 100644 --- a/lgsm/modules/info_distro.sh +++ b/lgsm/modules/info_distro.sh @@ -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 From 8bbb60202733683e945f14d6600969e1e0c3ba70 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 10 Dec 2023 20:03:10 +0000 Subject: [PATCH 3/3] Release v23.7.1 --- lgsm/modules/core_modules.sh | 2 +- linuxgsm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh index 42bc04a72..5a0543b9c 100644 --- a/lgsm/modules/core_modules.sh +++ b/lgsm/modules/core_modules.sh @@ -8,7 +8,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -modulesversion="v23.7.0" +modulesversion="v23.7.1" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index 73bcf638a..e3286d4f2 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -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"