From eb9ae5673f518562116904a7e9ed0167c71a338c Mon Sep 17 00:00:00 2001
From: Peter Vicman <peter.vicman@gmail.com>
Date: Wed, 1 Nov 2017 13:45:21 +0100
Subject: [PATCH] hdhomerun: fix parsing settings.xml file

---
 .../driver/hdhomerun/source/bin/userspace-driver.sh    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
index 71f6e56b7e..e5281fb22b 100644
--- a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
@@ -51,7 +51,15 @@ if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
 fi
 
 mkdir -p /var/config
-cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
+
+# check settings version
+XML_SETTINGS_VER="$(xmlstarlet sel -t -m settings -v @version $HDHR_ADDON_SETTINGS)"
+if [ "$XML_SETTINGS_VER" = "2" ]; then
+  xmlstarlet sel -t -m settings/setting -v @id -o "=\"" -v . -o "\"" -n "$HDHR_ADDON_SETTINGS" > /var/config/hdhomerun-addon.conf
+else
+  xmlstarlet sel -t -m settings -m setting -v @id -o "=\"" -v @value -o "\"" -n "$HDHR_ADDON_SETTINGS" > /var/config/hdhomerun-addon.conf
+fi
+
 . /var/config/hdhomerun-addon.conf
 
 if [ -z "$(pidof userhdhomerun)" ]; then