Merge 08786d64e8 into 62296e112e

scripts/spoolman.sh

@@ -248,17 +248,13 @@ function get_spoolman_status() {
 
 function get_local_spoolman_version() {
   local version
-  if [[ -d "${SPOOLMAN_DIR}" ]]; then
+  version=$(jq -r '.version' "${SPOOLMAN_DIR}"/release_info.json)
-    version=$(grep -o '"version":\s*"[^"]*' "${SPOOLMAN_DIR}"/release_info.json | cut -d'"' -f4)
-  else
-    version=""
-  fi
   echo "${version}"
 }
 
 function get_remote_spoolman_version() {
   local version
-  version=$(curl -s "${SPOOLMAN_REPO}" | grep -o '"tag_name":\s*"v[^"]*"' | cut -d'"' -f4)
+  version=$(curl -s "${SPOOLMAN_REPO}" | jq -r '.tag_name')
   echo "${version}"
 }
 

scripts/ui/remove_menu.sh

@@ -29,7 +29,7 @@ function remove_ui() {
   echo -e "|                           | 15) [Mobileraker]         |"
   echo -e "| Touchscreen GUI:          | 16) [NGINX]               |"
   echo -e "|  7) [KlipperScreen]       | 17) [OctoApp]             |"
-  echo -e "|                           | 18) [Spoolman]            |"
+  echo -e "|                           | 18) [Spoolman]             |"
   echo -e "| 3rd Party Webinterface:   |                           |"
   echo -e "|  8) [OctoPrint]           |                           |"
   back_footer