From d4ce3187f852f0432892edc06a77f6fb8c90f388 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 9 Mar 2012 00:04:49 +0200 Subject: [PATCH] vdr-addon: config & startup enhancements --- .../multimedia/vdr-addon/config/settings.xml | 14 ++++----- .../multimedia/vdr-addon/source/bin/vdr.start | 29 ++++--------------- .../vdr-addon/source/resources/settings.xml | 14 ++++----- 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 7cd93246a1..7898be9965 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index 6bdc56876b..ea82c9645d 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -38,31 +38,12 @@ if [ ! -f "$ADDON_SETTINGS" ]; then cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS fi -ENABLE_SOFTCAM=`grep enable_softcam $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -ENABLE_IPTV=`grep enable_iptv $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -ENABLE_STREAMDEV_CLIENT=`grep enable_streamdev_client $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -ENABLE_STREAMDEV_SERVER=`grep enable_streamdev_server $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -ENABLE_WIRBELSCAN=`grep enable_wirbelscan $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -SOFTCAM_PLUGIN=`grep softcam_plugin $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` +mkdir -p /var/config +cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default +cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf -# workaround for the case when settings.xml is not up-to-date -# happens on update from 2.0.8 or earlier. so we have to get addon defaults -# we may remove this later -[ -z "$ENABLE_SOFTCAM" ] && \ - ENABLE_SOFTCAM=`grep enable_softcam $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -[ -z "$ENABLE_IPTV" ] && \ - ENABLE_IPTV=`grep enable_iptv $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -[ -z "$ENABLE_STREAMDEV_CLIENT" ] && \ - ENABLE_STREAMDEV_CLIENT=`grep enable_streamdev_client $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -[ -z "$ENABLE_STREAMDEV_SERVER" ] && \ - ENABLE_STREAMDEV_SERVER=`grep enable_streamdev_server $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -[ -z "$ENABLE_WIRBELSCAN" ] && \ - ENABLE_WIRBELSCAN=`grep enable_wirbelscan $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -[ -z "SOFTCAM_PLUGIN" ] && \ - SOFTCAM_PLUGIN=`grep softcam_plugin $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -[ -z "$ENABLE_DYNAMITE" ] && \ - ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` +. /var/config/vdr.conf.default +. /var/config/vdr.conf VDR_ARG="-g /tmp --no-kbd --log=3 --port=0" VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR" diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index f20563d259..0f406def81 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -8,13 +8,13 @@ - - - - - + + + + + - - + +