From e02d2128faad74ed62a8a644557489c4f12fb470 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 27 Sep 2023 14:06:41 +0100 Subject: [PATCH] refactor: improve logging and error handling in install_config.sh - Refactored the code to use more descriptive function names. - Improved logging by using fn_print_ok_eol and fn_print_failure_eol functions. - Added error handling for copying config files, displaying failure messages if necessary. - Updated comments for better clarity. --- lgsm/modules/install_config.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh index 8c1dfb5dc..8486871a1 100644 --- a/lgsm/modules/install_config.sh +++ b/lgsm/modules/install_config.sh @@ -58,10 +58,10 @@ fn_default_config_remote() { exitcode=$? fi if [ "${exitcode}" != 0 ]; then - fn_print_failure_nl + fn_print_failure_eol fn_script_log_fatal "copying config file ${servercfg}." else - fn_print_ok_nl + fn_print_ok_eol fn_script_log_pass "copying config file ${servercfg}." fi done @@ -70,9 +70,15 @@ fn_default_config_remote() { # Copys local default config to server config location. fn_default_config_local() { - echo -e "copying ${servercfgdefault} config file." + echo -e "copying config file [ ${servercfgdefault} ]" cp -nv "${servercfgdir}/${servercfgdefault}" "${servercfgfullpath}" - fn_sleep_time + if [ "${exitcode}" != 0 ]; then + fn_print_failure_eol + fn_script_log_fatal "copying config file [ ${servercfgdefault} ]" + else + fn_print_ok_eol + fn_script_log_pass "copying config file [ ${servercfgdefault} ]" + fi } # Changes some variables within the default configs.