From 491ed9c10e71031602307f1d393cfae103b6049a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 21 Dec 2013 13:53:03 +0200 Subject: [PATCH] tvheadend: make it simple --- .../addons/service/multimedia/tvheadend/addon | 5 ---- .../tvheadend/source/bin/tvheadend.start | 26 +++---------------- .../tvheadend/{config => source}/dvr-config | 0 .../settings-default.xml} | 0 .../tvheadend/source/sleep.d/tvheadend.power | 5 ++-- .../{config => source}/timeshift-config | 0 .../tvheadend/{config => source}/xmltv-config | 0 7 files changed, 6 insertions(+), 30 deletions(-) rename packages/addons/service/multimedia/tvheadend/{config => source}/dvr-config (100%) rename packages/addons/service/multimedia/tvheadend/{config/settings.xml => source/settings-default.xml} (100%) rename packages/addons/service/multimedia/tvheadend/{config => source}/timeshift-config (100%) rename packages/addons/service/multimedia/tvheadend/{config => source}/xmltv-config (100%) diff --git a/packages/addons/service/multimedia/tvheadend/addon b/packages/addons/service/multimedia/tvheadend/addon index 018d2662aa..2536576777 100755 --- a/packages/addons/service/multimedia/tvheadend/addon +++ b/packages/addons/service/multimedia/tvheadend/addon @@ -22,11 +22,6 @@ . config/options $1 -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -PR $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml - cp -PR $PKG_DIR/config/xmltv-config $ADDON_BUILD/$PKG_ADDON_ID/xmltv-config - cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start index f11952d32c..46f35d1866 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start @@ -22,9 +22,8 @@ . /etc/profile -ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend" -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend" -LOG_FILE="$ADDON_HOME/service.log" +oe_setup_addon service.multimedia.tvheadend + ADDON_SETTINGS="$ADDON_HOME/settings.xml" XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file" XMLTV_SETTINGS_DIR="$ADDON_HOME/xmltv" @@ -36,16 +35,8 @@ TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift" TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config" TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift" -mkdir -p $ADDON_HOME - chmod a+x $ADDON_DIR/bin/* -if [ ! -f "$ADDON_SETTINGS" ]; then - if [ -f $ADDON_DIR/settings-default.xml ]; then - cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS - fi -fi - if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then mkdir -p $XMLTV_SETTINGS_DIR if [ -f $ADDON_DIR/xmltv-config ]; then @@ -75,15 +66,6 @@ else TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME" fi -mkdir -p /var/config -if [ -f $ADDON_DIR/settings-default.xml ]; then - cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default -fi -cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf - -. /var/config/tvheadend.conf.default -. /var/config/tvheadend.conf - # start userspace DVB driver/addon for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}') @@ -105,7 +87,7 @@ fi if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then logger -t Tvheadend "### Preloading capmt_ca.so library ###" - LD_PRELOAD="$ADDON_DIR/bin/capmt_ca.so $LD_PRELOAD" exec tvheadend $TVHEADEND_ARG &>$LOG_FILE + LD_PRELOAD="$ADDON_DIR/bin/capmt_ca.so $LD_PRELOAD" exec tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE else - exec tvheadend $TVHEADEND_ARG &>$LOG_FILE + exec tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE fi diff --git a/packages/addons/service/multimedia/tvheadend/config/dvr-config b/packages/addons/service/multimedia/tvheadend/source/dvr-config similarity index 100% rename from packages/addons/service/multimedia/tvheadend/config/dvr-config rename to packages/addons/service/multimedia/tvheadend/source/dvr-config diff --git a/packages/addons/service/multimedia/tvheadend/config/settings.xml b/packages/addons/service/multimedia/tvheadend/source/settings-default.xml similarity index 100% rename from packages/addons/service/multimedia/tvheadend/config/settings.xml rename to packages/addons/service/multimedia/tvheadend/source/settings-default.xml diff --git a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power index 20d448afa3..a09fd36792 100755 --- a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power +++ b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power @@ -22,10 +22,9 @@ . /etc/profile +oe_setup_addon service.multimedia.tvheadend + SERVICE="service.multimedia.tvheadend" -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend" -ADDON_SETTINGS="$ADDON_HOME/settings.xml" -REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'` case "$1" in pre) diff --git a/packages/addons/service/multimedia/tvheadend/config/timeshift-config b/packages/addons/service/multimedia/tvheadend/source/timeshift-config similarity index 100% rename from packages/addons/service/multimedia/tvheadend/config/timeshift-config rename to packages/addons/service/multimedia/tvheadend/source/timeshift-config diff --git a/packages/addons/service/multimedia/tvheadend/config/xmltv-config b/packages/addons/service/multimedia/tvheadend/source/xmltv-config similarity index 100% rename from packages/addons/service/multimedia/tvheadend/config/xmltv-config rename to packages/addons/service/multimedia/tvheadend/source/xmltv-config