From 8c0c484adb8eb83e54e7cf654be4dd515218801d Mon Sep 17 00:00:00 2001
From: Christopher Fenner <9592452+CFenner@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:40:33 +0100
Subject: [PATCH 1/4] Update rpi-cpu2mqtt.py

---
 src/rpi-cpu2mqtt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py
index f9903f6..65b06ac 100644
--- a/src/rpi-cpu2mqtt.py
+++ b/src/rpi-cpu2mqtt.py
@@ -127,7 +127,7 @@ def check_rpi5_fan_speed():
 def get_os():
     full_cmd = 'cat /etc/os-release | grep -i pretty_name'
     pretty_name = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8")
-    pretty_name = pretty_name.split('=')[1].replace('"', '')
+    pretty_name = pretty_name.split('=')[1].replace('"', '').replace('\n', '')
     
     return(pretty_name)
 
@@ -503,4 +503,4 @@ if __name__ == '__main__':
         if not args.service:
             break
         # if running as a service, sleep before the next iteration
-        time.sleep(config.service_sleep_time)
\ No newline at end of file
+        time.sleep(config.service_sleep_time)

From 5658454d4cb852290303f511dff029846ed60564 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <9592452+CFenner@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:08:40 +0100
Subject: [PATCH 2/4] Update rpi-cpu2mqtt.py

---
 src/rpi-cpu2mqtt.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py
index 65b06ac..8386502 100644
--- a/src/rpi-cpu2mqtt.py
+++ b/src/rpi-cpu2mqtt.py
@@ -293,6 +293,7 @@ def config_json(what_config):
         data["state_class"] = "measurement"
         data["payload_on"] = "on"
         data["payload_off"] = "off"
+        data["device_class"] = "update"
     else:
         return ""
     # Return our built discovery config

From ea4f7b1d522780d856a016ce60441fa507dace84 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <9592452+CFenner@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:12:20 +0100
Subject: [PATCH 3/4] Update rpi-cpu2mqtt.py

---
 src/rpi-cpu2mqtt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py
index 8386502..a6ab566 100644
--- a/src/rpi-cpu2mqtt.py
+++ b/src/rpi-cpu2mqtt.py
@@ -289,11 +289,11 @@ def config_json(what_config):
         data["state_class"] = "measurement"
     elif what_config == "git_update":
         data["icon"] = "mdi:git"
-        data["name"] = "Update Available"
+        data["name"] = "Script version"
+        data["device_class"] = "update"
         data["state_class"] = "measurement"
         data["payload_on"] = "on"
         data["payload_off"] = "off"
-        data["device_class"] = "update"
     else:
         return ""
     # Return our built discovery config

From 392c5f994c7d4bb725afe96038c25f89009d140c Mon Sep 17 00:00:00 2001
From: Christopher Fenner <9592452+CFenner@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:19:10 +0100
Subject: [PATCH 4/4] Apply suggestions from code review

---
 src/rpi-cpu2mqtt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py
index a6ab566..06387e8 100644
--- a/src/rpi-cpu2mqtt.py
+++ b/src/rpi-cpu2mqtt.py
@@ -289,7 +289,7 @@ def config_json(what_config):
         data["state_class"] = "measurement"
     elif what_config == "git_update":
         data["icon"] = "mdi:git"
-        data["name"] = "Script version"
+        data["name"] = "RPi MQTT Monitor"
         data["device_class"] = "update"
         data["state_class"] = "measurement"
         data["payload_on"] = "on"