Merge pull request #2168 from vpeter4/xmlparse-90

Fix parsing settings.xml file
This commit is contained in:
Radostan Riedel 2017-11-01 13:49:28 +01:00 committed by GitHub
commit 1bff5ea9d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions

View File

@ -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

View File

@ -35,7 +35,15 @@ if [ "$1" = "service" ]; then
SETTINGS_XML="$ADDON_HOME/settings.xml"
if [ -f "$SETTINGS_XML" ]; then
mkdir -p /var/config
cat "$SETTINGS_XML" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/ts_calibration_addon.conf
# check settings version
XML_SETTINGS_VER="$(xmlstarlet sel -t -m settings -v @version $SETTINGS_XML)"
if [ "$XML_SETTINGS_VER" = "2" ]; then
xmlstarlet sel -t -m settings/setting -v @id -o "=\"" -v . -o "\"" -n "$SETTINGS_XML" > /var/config/ts_calibration_addon.conf
else
xmlstarlet sel -t -m settings -m setting -v @id -o "=\"" -v @value -o "\"" -n "$SETTINGS_XML" > /var/config/ts_calibration_addon.conf
fi
. /var/config/ts_calibration_addon.conf
if [ "$TS_RECALIBRATE" = "true" ]; then