From 674c174224f7a7bf586f08c5f98301a023a88541 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sun, 20 Oct 2024 18:11:30 +0200 Subject: [PATCH] fix: correctly add Spoolman to moonraker.asvc (#581) Signed-off-by: Dominik Willner --- scripts/spoolman.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/spoolman.sh b/scripts/spoolman.sh index ba1f2bb..fd29edd 100644 --- a/scripts/spoolman.sh +++ b/scripts/spoolman.sh @@ -127,9 +127,9 @@ managed_services: Spoolman regex="${HOME//\//\\/}\/([A-Za-z0-9_]+)\/moonraker\.asvc" moonraker_asvc=$(find "${HOME}" -maxdepth 2 -type f -regextype posix-extended -regex "${regex}" | sort) - if [[ -n ${moonraker_asvc} ]]; then + if ! grep -q "^Spoolman$" "${moonraker_asvc}"; then status_msg "Adding Spoolman service to moonraker.asvc..." - /bin/sh -c "echo 'Spoolman' >> ${moonraker_asvc}" + sed -i '$a''Spoolman' "${moonraker_asvc}" fi } @@ -248,7 +248,7 @@ function get_spoolman_status() { function get_local_spoolman_version() { [[ ! -d "${SPOOLMAN_DIR}" ]] && return - + local version version=$(grep -o '"version":\s*"[^"]*' "${SPOOLMAN_DIR}"/release_info.json | cut -d'"' -f4) echo "${version}"