diff --git a/scripts/fluidd.sh b/scripts/fluidd.sh index b500822..5c27f88 100644 --- a/scripts/fluidd.sh +++ b/scripts/fluidd.sh @@ -125,7 +125,7 @@ function download_fluidd_macros(){ log_info "executing: download_fluidd_macros" local fluidd_cfg="https://raw.githubusercontent.com/fluidd-core/FluiddPI/master/src/modules/fluidd/filesystem/home/pi/klipper_config/fluidd.cfg" local configs - configs=$(find "${KLIPPER_CONFIG}" -type f -name "printer.cfg") + configs=$(find "${KLIPPER_CONFIG}" -type f -name "printer.cfg" | sort) if [ -n "${configs}" ]; then ### create a backup of the config folder backup_klipper_config_dir @@ -375,7 +375,7 @@ function select_fluidd_port(){ function patch_fluidd_update_manager(){ local moonraker_configs - moonraker_configs=$(find "$(get_klipper_cfg_dir)" -type f -name "moonraker.conf") + moonraker_configs=$(find "$(get_klipper_cfg_dir)" -type f -name "moonraker.conf" | sort) for conf in ${moonraker_configs}; do if ! grep -Eq "[update_manager fluidd]" "${conf}"; then ### add new line to conf if it doesn't end with one diff --git a/scripts/gcode_shell_command.sh b/scripts/gcode_shell_command.sh index f8d88b2..785cee6 100644 --- a/scripts/gcode_shell_command.sh +++ b/scripts/gcode_shell_command.sh @@ -97,7 +97,7 @@ function create_example_shell_command() { backup_klipper_config_dir local printer_cfgs - printer_cfgs=$(find "$(get_klipper_cfg_dir)" -type f -name "printer.cfg") + printer_cfgs=$(find "$(get_klipper_cfg_dir)" -type f -name "printer.cfg" | sort) for cfg in ${printer_cfgs}; do path=$(echo "${cfg}" | rev | cut -d"/" -f2- | rev) if [ ! -f "${path}/shell_command.cfg" ]; then diff --git a/scripts/klipper.sh b/scripts/klipper.sh index 602790f..5c9d0c1 100644 --- a/scripts/klipper.sh +++ b/scripts/klipper.sh @@ -18,13 +18,13 @@ set -e ### check for existing klipper service installations function klipper_initd() { local services - services=$(find "${INITD}" -maxdepth 1 -regextype posix-extended -regex "${INITD}/klipper(-[^0])?[0-9]*") + services=$(find "${INITD}" -maxdepth 1 -regextype posix-extended -regex "${INITD}/klipper(-[^0])?[0-9]*" | sort) echo "${services}" } function klipper_systemd() { local services - services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/klipper(-[^0])?[0-9]*.service") + services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/klipper(-[^0])?[0-9]*.service" | sort) echo "${services}" } @@ -271,7 +271,7 @@ function remove_klipper_systemd() { function remove_klipper_logs() { local files - files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/klippy(-[^0])?[0-9]*\.log(.*)?") + files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/klippy(-[^0])?[0-9]*\.log(.*)?" | sort) if [ -n "${files}" ]; then for file in ${files}; do status_msg "Removing ${file} ..." @@ -283,7 +283,7 @@ function remove_klipper_logs() { function remove_klipper_uds() { local files - files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/klippy_uds(-[^0])?[0-9]*") + files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/klippy_uds(-[^0])?[0-9]*" | sort) if [ -n "${files}" ]; then for file in ${files}; do status_msg "Removing ${file} ..." @@ -295,7 +295,7 @@ function remove_klipper_uds() { function remove_klipper_printer() { local files - files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/printer(-[^0])?[0-9]*") + files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/printer(-[^0])?[0-9]*" | sort) if [ -n "${files}" ]; then for file in ${files}; do status_msg "Removing ${file} ..." diff --git a/scripts/klipperscreen.sh b/scripts/klipperscreen.sh index bd65cc0..ff119c2 100644 --- a/scripts/klipperscreen.sh +++ b/scripts/klipperscreen.sh @@ -187,7 +187,7 @@ function compare_klipperscreen_versions(){ function patch_klipperscreen_update_manager(){ local moonraker_configs - moonraker_configs=$(find "$(get_klipper_cfg_dir)" -type f -name "moonraker.conf") + moonraker_configs=$(find "$(get_klipper_cfg_dir)" -type f -name "moonraker.conf" | sort) for conf in ${moonraker_configs}; do if ! grep -Eq "[update_manager KlipperScreen]" "${conf}"; then ### add new line to conf if it doesn't end with one diff --git a/scripts/mainsail.sh b/scripts/mainsail.sh index aacb357..0d3bf3e 100644 --- a/scripts/mainsail.sh +++ b/scripts/mainsail.sh @@ -125,7 +125,7 @@ function download_mainsail_macros(){ log_info "executing: download_mainsail_macros" local ms_cfg="https://raw.githubusercontent.com/mainsail-crew/MainsailOS/master/src/modules/mainsail/filesystem/home/pi/klipper_config/mainsail.cfg" local configs - configs=$(find "${KLIPPER_CONFIG}" -type f -name "printer.cfg") + configs=$(find "${KLIPPER_CONFIG}" -type f -name "printer.cfg" | sort) if [ -n "${configs}" ]; then ### create a backup of the config folder backup_klipper_config_dir @@ -497,7 +497,7 @@ function enable_mainsail_remotemode(){ function patch_mainsail_update_manager(){ local moonraker_configs - moonraker_configs=$(find "$(get_klipper_cfg_dir)" -type f -name "moonraker.conf") + moonraker_configs=$(find "$(get_klipper_cfg_dir)" -type f -name "moonraker.conf" | sort) for conf in ${moonraker_configs}; do if ! grep -Eq "[update_manager mainsail]" "${conf}"; then ### add new line to conf if it doesn't end with one diff --git a/scripts/moonraker-telegram-bot.sh b/scripts/moonraker-telegram-bot.sh index 5d05c53..b13d059 100644 --- a/scripts/moonraker-telegram-bot.sh +++ b/scripts/moonraker-telegram-bot.sh @@ -17,7 +17,7 @@ set -e function telegram_bot_systemd() { local services - services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker-telegram-bot(-[^0])?[0-9]*.service") + services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker-telegram-bot(-[^0])?[0-9]*.service" | sort) echo "${services}" } diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh index 8fb64a8..f74a0dc 100644 --- a/scripts/moonraker.sh +++ b/scripts/moonraker.sh @@ -17,7 +17,7 @@ set -e function moonraker_systemd() { local services - services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[^0])?[0-9]*.service") + services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[^0])?[0-9]*.service" | sort) echo "${services}" } @@ -316,7 +316,7 @@ function remove_moonraker_systemd() { function remove_moonraker_logs() { local files - files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/moonraker(-[^0])?[0-9]*\.log(.*)?") + files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/moonraker(-[^0])?[0-9]*\.log(.*)?" | sort) if [ -n "${files}" ]; then for file in ${files}; do status_msg "Removing ${file} ..." diff --git a/scripts/octoprint.sh b/scripts/octoprint.sh index 3df9dc9..70ed267 100644 --- a/scripts/octoprint.sh +++ b/scripts/octoprint.sh @@ -17,7 +17,7 @@ set -e function octoprint_systemd() { local services - services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/octoprint(-[^0])?[0-9]*.service") + services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/octoprint(-[^0])?[0-9]*.service" | sort) echo "${services}" } @@ -239,7 +239,7 @@ function remove_octoprint_sudoers(){ function remove_octoprint_env(){ local files - files=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/OctoPrint(_[^0])?[0-9]*") + files=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/OctoPrint(_[^0])?[0-9]*" | sort) if [ -n "${files}" ]; then for file in ${files}; do status_msg "Removing ${file} ..." @@ -251,7 +251,7 @@ function remove_octoprint_env(){ function remove_octoprint_dir(){ local files - files=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/.octoprint(_[^0])?[0-9]*") + files=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/.octoprint(_[^0])?[0-9]*" | sort) if [ -n "${files}" ]; then for file in ${files}; do status_msg "Removing ${file} ..." diff --git a/scripts/utilities.sh b/scripts/utilities.sh index 2ac7e6d..3f819b7 100644 --- a/scripts/utilities.sh +++ b/scripts/utilities.sh @@ -281,7 +281,7 @@ function set_klipper_cfg_path(){ fi fi done - moonraker_configs=$(find "${new_cfg_loc}" -type f -name "moonraker.conf") + moonraker_configs=$(find "${new_cfg_loc}" -type f -name "moonraker.conf" | sort) ### replace old file path with new one in moonraker.conf for conf in ${moonraker_configs}; do loc=$(echo "${conf}" | rev | cut -d"/" -f2- | rev) @@ -347,7 +347,7 @@ function set_custom_klipper_repo() { function do_action_service(){ local action=${1} service=${2} - services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/${service}(-[^0])?[0-9]*.service") + services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/${service}(-[^0])?[0-9]*.service" | sort) if [ -n "${services}" ]; then for service in ${services}; do service=$(echo "${service}" | rev | cut -d"/" -f1 | rev)