From 8314e59973ee411582f01f74cb8297a1a7dc86cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:12:47 +0200
Subject: [PATCH] Refactor (#7090)

---
 ct/ps5-mqtt.sh              | 21 +++++++--------------
 install/ps5-mqtt-install.sh | 15 +++++----------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/ct/ps5-mqtt.sh b/ct/ps5-mqtt.sh
index 956435ca9e..c10f4fc288 100644
--- a/ct/ps5-mqtt.sh
+++ b/ct/ps5-mqtt.sh
@@ -23,37 +23,30 @@ function update_script() {
     header_info
     check_container_storage
     check_container_resources
-
     if [[ ! -d /opt/ps5-mqtt ]]; then
         msg_error "No ${APP} installation found!"
         exit
     fi
 
-    RELEASE=$(curl -fsSL https://api.github.com/repos/FunkeyFlo/ps5-mqtt/releases/latest | jq -r '.tag_name')
-
-    if [[ "${RELEASE}" != "$(cat /opt/ps5-mqtt_version.txt)" ]]; then
+    RELEASE=$(curl -fsSL https://api.github.com/repos/FunkeyFlo/ps5-mqtt/releases/latest | jq -r '.tag_name' | sed 's/^v//')
+    if [[ "${RELEASE}" != "$(cat ~/.ps5-mqtt 2>/dev/null)" ]] || [[ ! -f ~/.ps5-mqtt ]]; then
         msg_info "Stopping service"
         systemctl stop ps5-mqtt
         msg_ok "Stopped service"
 
-        msg_info "Updating PS5-MQTT to ${RELEASE}"
-        curl -fsSL https://github.com/FunkeyFlo/ps5-mqtt/archive/refs/tags/${RELEASE}.tar.gz -o /tmp/${RELEASE}.tar.gz
-        rm -rf /opt/ps5-mqtt
-        tar zxf /tmp/${RELEASE}.tar.gz -C /opt
-        mv /opt/ps5-mqtt-* /opt/ps5-mqtt
-        rm /tmp/${RELEASE}.tar.gz
-        echo ${RELEASE} >/opt/ps5-mqtt_version.txt
-        msg_ok "Updated PS5-MQTT"
+        fetch_and_deploy_gh_release "ps5-mqtt" "FunkeyFlo/ps5-mqtt" "tarball"
 
-        msg_info "Building new PS5-MQTT version"
+        msg_info "Configuring ${APP}"
         cd /opt/ps5-mqtt/ps5-mqtt/
         $STD npm install
         $STD npm run build
-        msg_ok "Built new PS5-MQTT version"
+        msg_ok "Configured ${APP}"
 
         msg_info "Starting service"
         systemctl start ps5-mqtt
         msg_ok "Started service"
+
+        msg_ok "Updated successfully"
     else
         msg_ok "No update required. ${APP} is already at ${RELEASE}"
     fi
diff --git a/install/ps5-mqtt-install.sh b/install/ps5-mqtt-install.sh
index 5447fa0add..527d063e66 100644
--- a/install/ps5-mqtt-install.sh
+++ b/install/ps5-mqtt-install.sh
@@ -20,19 +20,12 @@ $STD apt-get install -y \
 msg_ok "Installed Dependencies"
 
 NODE_VERSION="22" NODE_MODULE="playactor" setup_nodejs
+fetch_and_deploy_gh_release "ps5-mqtt" "FunkeyFlo/ps5-mqtt" "tarball"
 
-msg_info "Installing PS5-MQTT"
-RELEASE=$(curl -fsSL https://api.github.com/repos/FunkeyFlo/ps5-mqtt/releases/latest | jq -r '.tag_name')
-curl -fsSL https://github.com/FunkeyFlo/ps5-mqtt/archive/refs/tags/${RELEASE}.tar.gz -o /tmp/${RELEASE}.tar.gz
-tar zxf /tmp/${RELEASE}.tar.gz -C /opt
-mv /opt/ps5-mqtt-* /opt/ps5-mqtt
+msg_info "Configuring PS5-MQTT"
 cd /opt/ps5-mqtt/ps5-mqtt/
 $STD npm install
 $STD npm run build
-echo ${RELEASE} >/opt/ps5-mqtt_version.txt
-msg_ok "Installed PS5-MQTT"
-
-msg_info "Creating Service"
 mkdir -p /opt/.config/ps5-mqtt/
 mkdir -p /opt/.config/ps5-mqtt/playactor
 cat <<EOF >/opt/.config/ps5-mqtt/config.json
@@ -64,6 +57,9 @@ cat <<EOF >/opt/.config/ps5-mqtt/config.json
   "frontendPort": "8645"
 }
 EOF
+msg_ok "Configured PS5-MQTT"
+
+msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/ps5-mqtt.service
 [Unit]
 Description=PS5-MQTT Daemon
@@ -92,5 +88,4 @@ customize
 msg_info "Cleaning up"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
-rm /tmp/${RELEASE}.tar.gz
 msg_ok "Cleaned"