Merge 6a766f7882 into a929c6983d

refactor: don't check spoolman version if not installed (#487 )
2025-12-25 00:33:37 +05:00 · 2024-06-29 07:57:05 +02:00 · 2024-06-28 23:07:20 +02:00
1 changed files with 5 additions and 5 deletions
--- a/scripts/spoolman.sh
+++ b/scripts/spoolman.sh
@@ -247,16 +247,16 @@ function get_spoolman_status() {
 }

 function get_local_spoolman_version() {
+  [[ ! -d "${SPOOLMAN_DIR}" ]] && return
+  
  local version
-  if [[ -d "${SPOOLMAN_DIR}" ]]; then
-    version=$(grep -o '"version":\s*"[^"]*' "${SPOOLMAN_DIR}"/release_info.json | cut -d'"' -f4)
-  else
-    version=""
-  fi
+  version=$(grep -o '"version":\s*"[^"]*' "${SPOOLMAN_DIR}"/release_info.json | cut -d'"' -f4)
  echo "${version}"
 }

 function get_remote_spoolman_version() {
+  [[ ! -d "${SPOOLMAN_DIR}" ]] && return
+
  local version
  version=$(curl -s "${SPOOLMAN_REPO}" | grep -o '"tag_name":\s*"v[^"]*"' | cut -d'"' -f4)
  echo "${version}"
Author	SHA1	Message	Date
skarasov	ae3484e784	Merge `6a766f7882` into `a929c6983d`	2024-06-29 07:57:05 +02:00
Beans Baxter	a929c6983d	refactor: don't check spoolman version if not installed (#487 )	2024-06-28 23:07:20 +02:00