From 8f7d1b0fac1dc5235e3b4937944a4f58bbbb1de6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 27 Sep 2023 09:29:38 +0100 Subject: [PATCH] refactor: improve log directory creation and server directory installation - Change log directory creation message to use bold font for emphasis. - Update symlink creation message to clarify that it is creating a symlink to the game log directory. - Add a check to skip creating a symlink if it already exists for the Steam log directory. - Change server directory installation message to use bold font for emphasis. --- lgsm/modules/install_logs.sh | 8 +++++--- lgsm/modules/install_server_dir.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lgsm/modules/install_logs.sh b/lgsm/modules/install_logs.sh index 2062e4314..6621c2def 100644 --- a/lgsm/modules/install_logs.sh +++ b/lgsm/modules/install_logs.sh @@ -9,7 +9,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ -z "${checklogs}" ]; then echo -e "" - echo -e "${lightyellow}Creating log directories${default}" + echo -e "${bold}${lightyellow}Creating Log Directories${default}" echo -e "=================================" fn_sleep_time fi @@ -93,7 +93,7 @@ fi # e.g serverfiles/log is not within log/: symlink created # log/server is in log/: symlink not created if [ -n "${gamelogdir}" ] && [ "${gamelogdir:0:${#logdir}}" != "${logdir}" ]; then - echo -en "creating symlink to game log dir [ ${logdir}/server -> ${gamelogdir} )" + echo -en "creating symlink to game log directory [ ${logdir}/server -> ${gamelogdir} )" # if path does not exist or does not match gamelogdir if [ ! -h "${logdir}/server" ] || [ "$(readlink -f "${logdir}/server")" != "${gamelogdir}" ]; then if ! ln -nfs "${gamelogdir}" "${logdir}/server"; then @@ -109,14 +109,16 @@ fi # If server uses SteamCMD create a symbolic link to the Steam logs. if [ -d "${HOME}/.steam/steam/logs" ]; then + echo -en "creating symlink to steam log directory [ ${logdir}/steam -> ${HOME}/.steam/steam/logs )" if [ ! -L "${logdir}/steam" ]; then - echo -en "creating symlink to steam log dir [ ${logdir}/steam -> ${HOME}/.steam/steam/logs )" if ! ln -nfs "${HOME}/.steam/steam/logs" "${logdir}/steam"; then fn_print_fail_eol_nl core_exit.sh else fn_print_ok_eol_nl fi + else + fn_print_skip_eol_nl fi fi fn_script_log_info "Logs installed" diff --git a/lgsm/modules/install_server_dir.sh b/lgsm/modules/install_server_dir.sh index a175ec51f..63ebbb806 100644 --- a/lgsm/modules/install_server_dir.sh +++ b/lgsm/modules/install_server_dir.sh @@ -8,7 +8,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" -echo -e "${lightyellow}Server Directory${default}" +echo -e "${bold}${lightyellow}Server Directory${default}" echo -e "${bold}=================================${default}" fn_sleep_time echo -en "creating ( ${serverfiles} )"