From cf05354c7b9a8e8e27e679be0a36fef38912aaa7 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 16 Oct 2022 14:24:15 +0200 Subject: [PATCH] fix: fix method to remove all env and log files Signed-off-by: Dominik Willner --- scripts/klipper.sh | 8 ++++---- scripts/moonraker.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/klipper.sh b/scripts/klipper.sh index 7951e0c..3c56c12 100644 --- a/scripts/klipper.sh +++ b/scripts/klipper.sh @@ -409,8 +409,8 @@ function remove_klipper_systemd() { } function remove_klipper_env_file() { - local files regex="klipper.env" - files=$(find "${PRINTER_DATA}" -maxdepth 2 -regextype posix-extended -regex "${PRINTER_DATA}/.*/${regex}" 2> /dev/null | sort) + local files name="klipper.env" + files=$(find "${PRINTER_DATA}" -name "${name}" 2> /dev/null | sort) if [[ -n ${files} ]]; then for file in ${files}; do @@ -422,8 +422,8 @@ function remove_klipper_env_file() { } function remove_klipper_logs() { - local files regex="klippy.log(.*)?" - files=$(find "${PRINTER_DATA}" -maxdepth 2 -regextype posix-extended -regex "${PRINTER_DATA}/.*/${regex}" 2> /dev/null | sort) + local files name="klippy.log*" + files=$(find "${PRINTER_DATA}" -name "${name}" 2> /dev/null | sort) if [[ -n ${files} ]]; then for file in ${files}; do diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh index 1760a77..ee72675 100644 --- a/scripts/moonraker.sh +++ b/scripts/moonraker.sh @@ -465,8 +465,8 @@ function remove_moonraker_systemd() { } function remove_moonraker_env_file() { - local files regex="moonraker.env" - files=$(find "${PRINTER_DATA}" -maxdepth 2 -regextype posix-extended -regex "${PRINTER_DATA}/.*/${regex}" 2> /dev/null | sort) + local files name="moonraker.env" + files=$(find "${PRINTER_DATA}" -name "${name}" 2> /dev/null | sort) if [[ -n ${files} ]]; then for file in ${files}; do @@ -478,8 +478,8 @@ function remove_moonraker_env_file() { } function remove_moonraker_logs() { - local files regex="moonraker.log(.*)?" - files=$(find "${PRINTER_DATA}" -maxdepth 2 -regextype posix-extended -regex "${PRINTER_DATA}/.*/${regex}" 2> /dev/null | sort) + local files name="moonraker.log*" + files=$(find "${PRINTER_DATA}" -name "${name}" 2> /dev/null | sort) if [[ -n ${files} ]]; then for file in ${files}; do