From 1803ea0323b00b6b12021a4067c02ae2052f1740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Thu, 14 Aug 2025 13:36:50 +0200
Subject: [PATCH] Refactor (#6820)

---
 ct/zwave-js-ui.sh              | 13 +++++--------
 install/zwave-js-ui-install.sh | 13 ++++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ct/zwave-js-ui.sh b/ct/zwave-js-ui.sh
index 4cd378c37..d1efe2a97 100644
--- a/ct/zwave-js-ui.sh
+++ b/ct/zwave-js-ui.sh
@@ -27,27 +27,24 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  RELEASE=$(curl -fsSL https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  
+  RELEASE=$(curl -fsSL https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  if [[ ! -f ~/.zwave-js-ui ]] || [[ "${RELEASE}" != "$(cat ~/.zwave-js-ui)" ]]; then
     msg_info "Stopping Service"
     systemctl stop zwave-js-ui
     msg_ok "Stopped Service"
 
-    msg_info "Updating Z-Wave JS UI"
     rm -rf /opt/zwave-js-ui/*
-    cd /opt/zwave-js-ui
-    curl -fsSL "https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip" -o $(basename "https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip")
-    $STD unzip zwave-js-ui-${RELEASE}-linux.zip
-    msg_ok "Updated Z-Wave JS UI"
+    fetch_and_deploy_gh_release "zwave-js-ui" "zwave-js/zwave-js-ui" "prebuild" "latest" "/opt/zwave-js-ui" "zwave-js-ui*-linux.zip"
 
     msg_info "Starting Service"
     systemctl start zwave-js-ui
     msg_ok "Started Service"
 
     msg_info "Cleanup"
-    rm -rf /opt/zwave-js-ui/zwave-js-ui-${RELEASE}-linux.zip
     rm -rf /opt/zwave-js-ui/store
     msg_ok "Cleaned"
+
     msg_ok "Updated Successfully!\n"
   else
     msg_ok "No update required.  ${APP} is already at ${RELEASE}."
diff --git a/install/zwave-js-ui-install.sh b/install/zwave-js-ui-install.sh
index e507cc3fc..366fdae1f 100644
--- a/install/zwave-js-ui-install.sh
+++ b/install/zwave-js-ui-install.sh
@@ -13,19 +13,15 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Z-Wave JS UI"
-mkdir -p /opt/zwave-js-ui
+fetch_and_deploy_gh_release "zwave-js-ui" "zwave-js/zwave-js-ui" "prebuild" "latest" "/opt/zwave-js-ui" "zwave-js-ui*-linux.zip"
+
+msg_info "Configuring Z-Wave JS UI"
 mkdir -p /opt/zwave_store
-cd /opt/zwave-js-ui
-RELEASE=$(curl -fsSL https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-curl -fsSL "https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip" -o "zwave-js-ui-${RELEASE}-linux.zip"
-$STD unzip zwave-js-ui-${RELEASE}-linux.zip
 cat <<EOF >/opt/.env
 ZWAVEJS_EXTERNAL_CONFIG=/opt/zwave_store/.config-db
 STORE_DIR=/opt/zwave_store
 EOF
-echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
-msg_ok "Installed Z-Wave JS UI"
+msg_ok "Configured Z-Wave JS UI"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/zwave-js-ui.service
@@ -50,7 +46,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm zwave-js-ui-${RELEASE}-linux.zip
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"