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

get_instance_name takes base_name now so that it won't confuse moonraker-obico as an instance of Moonraker

Browse Source
This commit is contained in:
Kenneth Jiang
2022-08-01 16:11:01 -07:00
parent 8f5bdf2707
commit ff9b563131
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/moonraker.sh
View File

@@ -17,7 +17,7 @@ set -e
function moonraker_systemd() {
local services
services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[0-9a-zA-Z]+)?.service" | sort)
services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[0-9a-zA-Z]+)?.service" | grep -v "moonraker-obico" | sort)
echo "${services}"
}
@@ -55,7 +55,7 @@ function moonraker_setup_dialog() {
local klipper_count user_input=() klipper_names=()
klipper_count=$(echo "${klipper_services}" | wc -w )
for service in ${klipper_services}; do
klipper_names+=( "$(get_instance_name "${service}")" )
klipper_names+=( "$(get_instance_name "${service}" moonraker)" )
done
local moonraker_count
@@ -572,4 +572,4 @@ function compare_moonraker_versions() {
fi
echo "${versions}"
}
}