tvheadend: make it simple

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

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -22,9 +22,8 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
+oe_setup_addon service.multimedia.tvheadend
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
+
-LOG_FILE="$ADDON_HOME/service.log"
 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

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)