From f28becd8ca573ab637bf27e56b64fb48ac033e6a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 9 Feb 2025 17:08:47 +0000 Subject: [PATCH 1/3] revert: mapfile to declare --- lgsm/modules/command_backup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/modules/command_backup.sh b/lgsm/modules/command_backup.sh index 010c605777..f427e8b008 100644 --- a/lgsm/modules/command_backup.sh +++ b/lgsm/modules/command_backup.sh @@ -190,7 +190,7 @@ fn_backup_prune() { fn_backup_relpath() { # Written by CedarLUG as a "realpath --relative-to" alternative in bash. # Populate an array of tokens initialized from the rootdir components. - mapfile -t rdirtoks < <(readlink -f "${rootdir}" | sed "s/\// /g") + declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g")) if [ ${#rdirtoks[@]} -eq 0 ]; then fn_print_fail_nl "Problem assessing rootdir during relative path assessment" fn_script_log_fail "Problem assessing rootdir during relative path assessment: ${rootdir}" @@ -198,7 +198,7 @@ fn_backup_relpath() { fi # Populate an array of tokens initialized from the backupdir components. - mapfile -t bdirtoks < <(readlink -f "${backupdir}" | sed "s/\// /g") + declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g")) if [ ${#bdirtoks[@]} -eq 0 ]; then fn_print_fail_nl "Problem assessing backupdir during relative path assessment" fn_script_log_fail "Problem assessing backupdir during relative path assessment: ${rootdir}" From 421971c73f3c10617d4ae3f4c2dd949b4bfc4564 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 9 Feb 2025 17:17:21 +0000 Subject: [PATCH 2/3] fix: minor messaging bug --- lgsm/modules/update_jk2.sh | 2 +- lgsm/modules/update_mc.sh | 2 +- lgsm/modules/update_mcb.sh | 2 +- lgsm/modules/update_mta.sh | 2 +- lgsm/modules/update_pmc.sh | 2 +- lgsm/modules/update_ts3.sh | 2 +- lgsm/modules/update_ut99.sh | 2 +- lgsm/modules/update_vints.sh | 2 +- lgsm/modules/update_xnt.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lgsm/modules/update_jk2.sh b/lgsm/modules/update_jk2.sh index 20350aec60..af2709ec69 100644 --- a/lgsm/modules/update_jk2.sh +++ b/lgsm/modules/update_jk2.sh @@ -154,7 +154,7 @@ remotelocation="github.com" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_mc.sh b/lgsm/modules/update_mc.sh index 8cac4067bd..897b0df27d 100644 --- a/lgsm/modules/update_mc.sh +++ b/lgsm/modules/update_mc.sh @@ -169,7 +169,7 @@ remotelocation="mojang.com" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_mcb.sh b/lgsm/modules/update_mcb.sh index 8b66aa0067..29faf33634 100644 --- a/lgsm/modules/update_mcb.sh +++ b/lgsm/modules/update_mcb.sh @@ -177,7 +177,7 @@ remotelocation="minecraft.net" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_mta.sh b/lgsm/modules/update_mta.sh index e677723a09..0946cf6428 100644 --- a/lgsm/modules/update_mta.sh +++ b/lgsm/modules/update_mta.sh @@ -162,7 +162,7 @@ remotelocation="linux.mtasa.com" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_pmc.sh b/lgsm/modules/update_pmc.sh index 053d1f9ae7..0a883c1506 100644 --- a/lgsm/modules/update_pmc.sh +++ b/lgsm/modules/update_pmc.sh @@ -179,7 +179,7 @@ remotelocation="papermc.io" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_ts3.sh b/lgsm/modules/update_ts3.sh index 8bbbbc2b28..abc9a60c8b 100644 --- a/lgsm/modules/update_ts3.sh +++ b/lgsm/modules/update_ts3.sh @@ -173,7 +173,7 @@ remotelocation="teamspeak.com" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_ut99.sh b/lgsm/modules/update_ut99.sh index f83208e6f6..e8d4a28488 100644 --- a/lgsm/modules/update_ut99.sh +++ b/lgsm/modules/update_ut99.sh @@ -155,7 +155,7 @@ remotelocation="github.com" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_vints.sh b/lgsm/modules/update_vints.sh index 1e17cac7d8..e683156dbf 100644 --- a/lgsm/modules/update_vints.sh +++ b/lgsm/modules/update_vints.sh @@ -162,7 +162,7 @@ remotelocation="vintagestory.at" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi diff --git a/lgsm/modules/update_xnt.sh b/lgsm/modules/update_xnt.sh index 31c5c12491..05b73d33cf 100644 --- a/lgsm/modules/update_xnt.sh +++ b/lgsm/modules/update_xnt.sh @@ -162,7 +162,7 @@ remotelocation="github.com" if [ "$(command -v jq 2> /dev/null)" ]; then fn_print_fail_nl "jq is not installed" - fn_script_log_fatal "jq is not installed" + fn_script_log_fail "jq is not installed" core_exit.sh fi From 5e5cd30a1017e19e47787a24371b4fcc44e3c849 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 9 Feb 2025 17:33:42 +0000 Subject: [PATCH 3/3] Release v25.1.3 --- 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 4c72f127bb..af80ba05fd 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="v25.1.1" +modulesversion="v25.1.3" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index 9d689231cb..d73ee70946 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v25.1.1" +version="v25.1.3" shortname="core" gameservername="core" commandname="CORE"