From edbe8e784039ee00f60d14ba9df3b4be31839642 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Thu, 20 Oct 2022 10:01:06 +0200 Subject: [PATCH] feat: add functions to remove legacy files Signed-off-by: Dominik Willner --- scripts/fluidd.sh | 14 ++++++++++++++ scripts/klipper.sh | 28 ++++++++++++++++++++++++++++ scripts/mainsail.sh | 14 ++++++++++++++ scripts/moonraker.sh | 14 ++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/scripts/fluidd.sh b/scripts/fluidd.sh index 661c2ce..1277989 100644 --- a/scripts/fluidd.sh +++ b/scripts/fluidd.sh @@ -230,11 +230,25 @@ function remove_fluidd_log_symlinks() { fi } +function remove_legacy_fluidd_log_symlinks() { + local files + files=$(find "${HOME}/klipper_logs" -name "fluidd*" 2> /dev/null | sort) + + if [[ -n ${files} ]]; then + for file in ${files}; do + status_msg "Removing ${file} ..." + rm -f "${file}" + ok_msg "${file} removed!" + done + fi +} + function remove_fluidd() { remove_fluidd_dir remove_fluidd_config remove_fluidd_logs remove_fluidd_log_symlinks + remove_legacy_fluidd_log_symlinks ### remove fluidd_port from ~/.kiauh.ini sed -i "/^fluidd_port=/d" "${INI_FILE}" diff --git a/scripts/klipper.sh b/scripts/klipper.sh index b67f40a..2fdaa50 100644 --- a/scripts/klipper.sh +++ b/scripts/klipper.sh @@ -434,6 +434,19 @@ function remove_klipper_logs() { fi } +function remove_legacy_klipper_logs() { + local files regex="klippy(-[0-9a-zA-Z]+)?\.log(.*)?" + files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/${regex}" 2> /dev/null | sort) + + if [[ -n ${files} ]]; then + for file in ${files}; do + status_msg "Removing ${file} ..." + rm -f "${file}" + ok_msg "${file} removed!" + done + fi +} + function remove_klipper_uds() { local files regex="\/home\/${USER}\/([A-Za-z0-9_]+)\/comms\/klippy\.sock" files=$(find "${HOME}" -maxdepth 3 -regextype posix-extended -regex "${regex}" | sort) @@ -460,6 +473,19 @@ function remove_klipper_printer() { fi } +function remove_legacy_klipper_printer() { + local files + files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/printer(-[0-9a-zA-Z]+)?" | sort) + + if [[ -n ${files} ]]; then + for file in ${files}; do + status_msg "Removing ${file} ..." + rm -f "${file}" + ok_msg "${file} removed!" + done + fi +} + function remove_klipper_dir() { [[ ! -d ${KLIPPER_DIR} ]] && return @@ -481,8 +507,10 @@ function remove_klipper() { remove_klipper_systemd remove_klipper_env_file remove_klipper_logs + remove_legacy_klipper_logs remove_klipper_uds remove_klipper_printer + remove_legacy_klipper_printer remove_klipper_dir remove_klipper_env diff --git a/scripts/mainsail.sh b/scripts/mainsail.sh index 4e8bc9f..b3310ed 100644 --- a/scripts/mainsail.sh +++ b/scripts/mainsail.sh @@ -235,11 +235,25 @@ function remove_mainsail_log_symlinks() { fi } +function remove_legacy_mainsail_log_symlinks() { + local files + files=$(find "${HOME}/klipper_logs" -name "mainsail*" 2> /dev/null | sort) + + if [[ -n ${files} ]]; then + for file in ${files}; do + status_msg "Removing ${file} ..." + rm -f "${file}" + ok_msg "${file} removed!" + done + fi +} + function remove_mainsail() { remove_mainsail_dir remove_mainsail_config remove_mainsail_logs remove_mainsail_log_symlinks + remove_legacy_mainsail_log_symlinks ### remove mainsail_port from ~/.kiauh.ini sed -i "/^mainsail_port=/d" "${INI_FILE}" diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh index 2249068..707b27d 100644 --- a/scripts/moonraker.sh +++ b/scripts/moonraker.sh @@ -490,6 +490,19 @@ function remove_moonraker_logs() { fi } +function remove_legacy_moonraker_logs() { + local files regex="moonraker(-[0-9a-zA-Z]+)?\.log(.*)?" + files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/${regex}" 2> /dev/null | sort) + + if [[ -n ${files} ]]; then + for file in ${files}; do + status_msg "Removing ${file} ..." + rm -f "${file}" + ok_msg "${file} removed!" + done + fi +} + function remove_moonraker_api_key() { ### remove legacy api key if [[ -e "${HOME}/.klippy_api_key" ]]; then @@ -535,6 +548,7 @@ function remove_moonraker() { remove_moonraker_systemd remove_moonraker_env_file remove_moonraker_logs + remove_legacy_moonraker_logs remove_moonraker_api_key remove_moonraker_polkit remove_moonraker_dir