h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor(klipper): refactor remove functions in more flexible instance remove functions

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2022-11-13 12:59:40 +01:00
parent 1ff5241a53
commit bece85411b
1 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
scripts/klipper.sh
View File

@@ -397,51 +397,37 @@ function write_example_printer_cfg() {
#================ REMOVE KLIPPER ================# #================ REMOVE KLIPPER ================#
#================================================# #================================================#
function remove_klipper_sysvinit() { function remove_klipper_service() {
[[ ! -e "${INITD}/klipper" ]] && return if [[ ! -e "${INITD}/klipper" ]] && [[ -z $(find_klipper_systemd) ]]; then
return
fi
status_msg "Removing Klipper SysVinit service ..." status_msg "Removing Klipper services ..."
sudo systemctl stop klipper
sudo update-rc.d -f klipper remove
sudo rm -f "${INITD}/klipper" "${ETCDEF}/klipper"
ok_msg "Klipper SysVinit service removed!"
}
function remove_klipper_systemd() { if [[ -e "${INITD}/klipper" ]]; then
[[ -z $(find_klipper_systemd) ]] && return sudo systemctl stop klipper
sudo update-rc.d -f klipper remove
status_msg "Removing Klipper Systemd Services ..." sudo rm -f "${INITD}/klipper" "${ETCDEF}/klipper"
for service in $(find_klipper_systemd | cut -d"/" -f5); do else
status_msg "Removing ${service} ..." for service in $(find_klipper_systemd | cut -d"/" -f5); do
sudo systemctl stop "${service}" status_msg "Removing ${service} ..."
sudo systemctl disable "${service}" sudo systemctl stop "${service}"
sudo rm -f "${SYSTEMD}/${service}" sudo systemctl disable "${service}"
ok_msg "Done!" sudo rm -f "${SYSTEMD}/${service}"
done sudo systemctl daemon-reload
sudo systemctl reset-failed
### reloading units
sudo systemctl daemon-reload
sudo systemctl reset-failed
ok_msg "Klipper Service removed!"
}
function remove_klipper_env_file() {
local files regex="\/home\/${USER}\/([A-Za-z0-9_]+)\/systemd\/klipper\.env"
files=$(find "${HOME}" -maxdepth 3 -regextype posix-extended -regex "${regex}" | sort)
if [[ -n ${files} ]]; then
for file in ${files}; do
status_msg "Removing ${file} ..."
rm -f "${file}"
ok_msg "${file} removed!"
done done
fi fi
ok_msg "All Klipper services removed!"
} }
function remove_klipper_logs() { function remove_instance_files() {
local files regex="\/home\/${USER}\/([A-Za-z0-9_]+)\/logs\/klippy\.log.*" local target_folder=${1}
files=$(find "${HOME}" -maxdepth 3 -regextype posix-extended -regex "${regex}" | sort) local target_name=${2}
local files
files=$(find "${HOME}" -regex "${HOME}/[A-Za-z0-9_]+_data/${target_folder}/${target_name}")
if [[ -n ${files} ]]; then if [[ -n ${files} ]]; then
for file in ${files}; do for file in ${files}; do
status_msg "Removing ${file} ..." status_msg "Removing ${file} ..."
@@ -464,22 +450,9 @@ function remove_legacy_klipper_logs() {
fi fi
} }
function remove_klipper_uds() { function remove_legacy_klipper_uds() {
local files regex="\/home\/${USER}\/([A-Za-z0-9_]+)\/comms\/klippy\.sock" local files
files=$(find "${HOME}" -maxdepth 3 -regextype posix-extended -regex "${regex}" | sort) files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/klippy_uds(-[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_printer() {
local files regex="\/home\/${USER}\/([A-Za-z0-9_]+)\/comms\/klippy\.serial"
files=$(find "${HOME}" -maxdepth 3 -regextype posix-extended -regex "${regex}" | sort)
if [[ -n ${files} ]]; then if [[ -n ${files} ]]; then
for file in ${files}; do for file in ${files}; do
@@ -520,19 +493,20 @@ function remove_klipper_env() {
} }
function remove_klipper() { function remove_klipper() {
remove_klipper_sysvinit remove_klipper_service
remove_klipper_systemd remove_instance_files "systemd" "klipper.env"
remove_klipper_env_file remove_instance_files "logs" "klippy.log.*"
remove_klipper_logs remove_instance_files "comms" "klippy.sock"
remove_instance_files "comms" "klippy.serial"
remove_legacy_klipper_logs remove_legacy_klipper_logs
remove_klipper_uds remove_legacy_klipper_uds
remove_klipper_printer
remove_legacy_klipper_printer remove_legacy_klipper_printer
remove_klipper_dir remove_klipper_dir
remove_klipper_env remove_klipper_env
local confirm="Klipper was successfully removed!" print_confirm "Klipper was successfully removed!" && return
print_confirm "${confirm}" && return
} }
#================================================# #================================================#