From 0f65830c5e225a87619d82eea9cf690ecc3d03db Mon Sep 17 00:00:00 2001 From: Dominik Dzienia Date: Tue, 6 Jan 2026 02:11:57 +0100 Subject: [PATCH] More cleanup fixes --- src/app_watchdog.sh | 4 ++-- src/logic_cleanup.sh | 8 ++++---- src/logic_watchdog.sh | 2 +- src/utils_console.sh | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/app_watchdog.sh b/src/app_watchdog.sh index b129f53..b8e157a 100644 --- a/src/app_watchdog.sh +++ b/src/app_watchdog.sh @@ -19,7 +19,7 @@ show_watchdog_logs() { { echo "Ostatnie uruchomienie watchdoga:" get_watchdog_age_string - echo "-------------------------------------------------------" + hline if [[ -f $WATCHDOG_LOG_FILE ]]; then echo "Statusy ostatnich przebiegów watchdoga:" @@ -27,7 +27,7 @@ show_watchdog_logs() { else echo "Brak logów z ostatnich przebiegów watchdoga" fi - echo "-------------------------------------------------------" + hline if [[ -f $WATCHDOG_CRON_LOG ]]; then echo "Log ostatniego przebiegu watchdoga:" diff --git a/src/logic_cleanup.sh b/src/logic_cleanup.sh index d532c86..134fbae 100644 --- a/src/logic_cleanup.sh +++ b/src/logic_cleanup.sh @@ -89,14 +89,14 @@ cleanup_stats() { "\n Zajęte: ${fixedPerc} (z ${totalTxt})" )")\n" - echo "\n---------------------------\n" - echo "$statusTitle" - echo "\n---------------------------\n" + hline + echo "${statusTitle/=/%}" + hline } do_cleanup_all() { echo "Cleanup" - echo "\n---------------------------\n" + hline do_cleanup_container_logs do_cleanup_sys do_cleanup_docker diff --git a/src/logic_watchdog.sh b/src/logic_watchdog.sh index 83c6886..d4eddab 100644 --- a/src/logic_watchdog.sh +++ b/src/logic_watchdog.sh @@ -239,7 +239,7 @@ watchdog_check() { if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then { - echo "----------------------------------------------------------------" + hline echo "[$WATCHDOG_TIME] Unknown server failure:" echo "CONTAINERS:" docker stats --no-stream diff --git a/src/utils_console.sh b/src/utils_console.sh index 840a751..32bf81b 100644 --- a/src/utils_console.sh +++ b/src/utils_console.sh @@ -76,6 +76,14 @@ msgdebug() { fi } +hline() { + if [ "$NONINTERACTIVE_MODE" = "true" ]; then + printf "-------------------------------------------------------\n" + else + printf "${tty_bold}-------------------------------------------------------${tty_reset}\n" + fi +} + warn() { if [ "$NONINTERACTIVE_MODE" = "true" ]; then # shellcheck disable=SC2059