From c89500cbacaafda094a40d0a8d553018936f1a61 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 19:56:44 +0200 Subject: [PATCH 01/10] Init RAM requirement check --- lgsm/functions/check_system_requirements.sh | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 lgsm/functions/check_system_requirements.sh diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh new file mode 100644 index 000000000..dde47efb0 --- /dev/null +++ b/lgsm/functions/check_system_requirements.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# LGSM check_system_requirements.sh +# Author: Daniel Gibbs +# Contributor: UltimateByte +# Website: https://gameservermanagers.com +# Description: Checks RAM requirement + +mbphysmem=$(free -m | awk '/Mem:/ {print $2}') + +# RAM requirement in MegaBytes for each game or engine +if [ "${gamename} == "Rust" ]; then + ramrequirement="4000" +fi + +# If the game or engine has a minimum RAM Requirement, compare it to system's available RAM +if [ -n "${ramrequirement}" ]; then + if [ "${mbphysmem}" -lt "${ramrequirement} ]; then + # Warn the user + fn_print_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." + echo "You may encounter issues such as server lagging or shutting down unexpectedly." + fn_script_log_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." + fi +fi From 18d94278f1338dfd953ff44c933f758c6c36dbb4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:08:50 +0200 Subject: [PATCH 02/10] Check system requirements --- lgsm/functions/check.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh index 95e1a92ba..ac5fb9bc8 100644 --- a/lgsm/functions/check.sh +++ b/lgsm/functions/check.sh @@ -83,3 +83,11 @@ do check_status.sh fi done + +local allowed_commands_array=( command_install.sh command_start.sh command_debug.sh ) +for allowed_command in "${allowed_commands_array[@]}" +do + if [ "${allowed_command}" == "${function_selfname}" ]; then + check_system_requirements.sh + fi +done From 3e77fc24f699805c2d0be04721a6ccfbff872e57 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:10:58 +0200 Subject: [PATCH 03/10] added sleeps --- lgsm/functions/check_system_requirements.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index dde47efb0..cf8e40d00 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -17,7 +17,9 @@ if [ -n "${ramrequirement}" ]; then if [ "${mbphysmem}" -lt "${ramrequirement} ]; then # Warn the user fn_print_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." + sleep 2 echo "You may encounter issues such as server lagging or shutting down unexpectedly." + sleep 0.5 fn_script_log_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." fi fi From 633372e84b435817cafff8ee5264a8cfc57495b0 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:17:18 +0200 Subject: [PATCH 04/10] added function check_system_requirements.sh --- lgsm/functions/core_functions.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index e89b18fe7..ba8e3a241 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -222,6 +222,11 @@ functionfile="${FUNCNAME}" fn_fetch_function } +check_system_requirements.sh(){ +functionfile="${FUNCANME}" +fn_fetch_function +} + check_tmux.sh(){ functionfile="${FUNCNAME}" fn_fetch_function From fc99a2cf30ba27979c1d1394183e7bbb786036dc Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:27:03 +0200 Subject: [PATCH 05/10] Missing quotes --- lgsm/functions/check_system_requirements.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index cf8e40d00..5743281e6 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -8,13 +8,13 @@ mbphysmem=$(free -m | awk '/Mem:/ {print $2}') # RAM requirement in MegaBytes for each game or engine -if [ "${gamename} == "Rust" ]; then +if [ "${gamename}" == "Rust" ]; then ramrequirement="4000" fi # If the game or engine has a minimum RAM Requirement, compare it to system's available RAM if [ -n "${ramrequirement}" ]; then - if [ "${mbphysmem}" -lt "${ramrequirement} ]; then + if [ "${mbphysmem}" -lt "${ramrequirement}"" ]; then # Warn the user fn_print_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." sleep 2 From 03951aefed981e5b3cf9ed77dcdfe958490943a7 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:36:10 +0200 Subject: [PATCH 06/10] FUNCANME > FUNCNAME for fuck sake --- lgsm/functions/core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index ba8e3a241..2dda20940 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -223,7 +223,7 @@ fn_fetch_function } check_system_requirements.sh(){ -functionfile="${FUNCANME}" +functionfile="${FUNCNAME}" fn_fetch_function } From cce566e8857ba7d396a59caf8f4a578d927c4feb Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:37:34 +0200 Subject: [PATCH 07/10] removed damn autoquote --- lgsm/functions/check_system_requirements.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index 5743281e6..5a0409265 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -14,7 +14,7 @@ fi # If the game or engine has a minimum RAM Requirement, compare it to system's available RAM if [ -n "${ramrequirement}" ]; then - if [ "${mbphysmem}" -lt "${ramrequirement}"" ]; then + if [ "${mbphysmem}" -lt "${ramrequirement}" ]; then # Warn the user fn_print_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." sleep 2 From 3f52a2f9880c30846038613bf66ad88ded6e5985 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 26 Jul 2016 20:40:04 +0200 Subject: [PATCH 08/10] Line jump --- lgsm/functions/check_system_requirements.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index 5a0409265..53d09a93b 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -18,6 +18,7 @@ if [ -n "${ramrequirement}" ]; then # Warn the user fn_print_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." sleep 2 + echo "" echo "You may encounter issues such as server lagging or shutting down unexpectedly." sleep 0.5 fn_script_log_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." From 1ba937212210dbc0c7126d0158538a1f63c757d0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 27 Jul 2016 22:20:09 +0100 Subject: [PATCH 09/10] added physicaltotalmb --- lgsm/functions/info_distro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index b75499f3d..3e81c1a60 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -61,13 +61,13 @@ else fi physmemtotal=$(free ${humanreadable} | awk '/Mem:/ {print $2}') +physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}') swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}') - ### Disk Infomation ## Available disk space on the partition. From 0d4df73f17010360258d3938bac4b95cd5fa5f24 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 27 Jul 2016 22:22:01 +0100 Subject: [PATCH 10/10] using info_distro and updated messages --- lgsm/functions/check_system_requirements.sh | 32 +++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index 53d09a93b..d9e56cc5f 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -3,24 +3,26 @@ # Author: Daniel Gibbs # Contributor: UltimateByte # Website: https://gameservermanagers.com -# Description: Checks RAM requirement +# Description: Checks RAM requirements -mbphysmem=$(free -m | awk '/Mem:/ {print $2}') +local commandname="CHECK" +local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" -# RAM requirement in MegaBytes for each game or engine +info_distro.sh + +# RAM requirements in megabytes for each game or engine. if [ "${gamename}" == "Rust" ]; then - ramrequirement="4000" + ramrequirementmb="4000" + ramrequirementgb="4" 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 [ -n "${ramrequirement}" ]; then - if [ "${mbphysmem}" -lt "${ramrequirement}" ]; then - # Warn the user - fn_print_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." - sleep 2 - echo "" - echo "You may encounter issues such as server lagging or shutting down unexpectedly." - sleep 0.5 - fn_script_log_warn "Insufficient physical RAM: ${mbphysmem}MB available for ${ramrequirement}MB required." - fi -fi + if [ "${physmemtotalmb}" -lt "${ramrequirementmb}" ]; then + # Warn the user + fn_print_warn "Insufficient memory: ${ramrequirementgb}G required, ${physmemtotal} available" + sleep 1 + fn_print_warning "You may experiance poor performance from your server" + sleep 1 + fi +fi