Преглед изворни кода

Merge branch 'hotfix/v23.7.1'

Daniel Gibbs пре 2 година
родитељ
комит
d08e5f5f16
4 измењених фајлова са 7 додато и 6 уклоњено
  1. 1 1
      lgsm/modules/check_system_requirements.sh
  2. 1 1
      lgsm/modules/core_modules.sh
  3. 4 3
      lgsm/modules/info_distro.sh
  4. 1 1
      linuxgsm.sh

+ 1 - 1
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 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."

+ 1 - 1
lgsm/modules/core_modules.sh

@@ -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
 
 

+ 4 - 3
lgsm/modules/info_distro.sh

@@ -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"
-		physmemcached="n/a"
+		physmemavailable="n/a" # string
+		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

+ 1 - 1
linuxgsm.sh

@@ -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"