From 23f00095ee4924e35d373982be767ee8e6417ab3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 23 Oct 2012 15:28:17 +0200
Subject: [PATCH] hts-tvheadend: add support to install as system addon

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../multimedia/hts-tvheadend/changelog.txt    |  3 +++
 .../hts-tvheadend/source/bin/tvheadend.start  | 27 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index d0888f1041..d8f1b45f2c 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+2.1.6 (unreleased)
+- add support to install as system addon
+
 2.1.5
 - add an option to wait for more than 1 adapters to appear
 
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
index 2014cff73d..db8418cbb0 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
@@ -26,6 +26,7 @@ LOCKDIR="/var/lock/"
 LOCKFILE="tvheadend.disabled"
 
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
+ADDON_SYS_DIR="/usr/lib/xbmc/addons/service.multimedia.hts-tvheadend"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 ADDON_BIN="tvheadend"
 LOG_FILE="$ADDON_HOME/service.log"
@@ -38,25 +39,41 @@ DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
 DVR_DIR="$HOME/recordings"
 
 if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+  if [ -f $ADDON_DIR/settings-default.xml ]; then
+    cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+  elif [ -f $ADDON_SYS_DIR/settings-default.xml ]; then
+    cp $ADDON_SYS_DIR/settings-default.xml $ADDON_SETTINGS
+  fi
 fi
 
 if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
   mkdir -p $XMLTV_SETTINGS_DIR
-  cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  if [ -f $ADDON_DIR/xmltv-config ]; then
+    cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/xmltv-config ]; then
+    cp $ADDON_SYS_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  fi
 fi
 
 if [ ! -f "$DVR_SETTINGS_FILE" ]; then
   mkdir -p $DVR_DIR
   mkdir -p $DVR_SETTINGS_DIR
-  cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
+  if [ -f $ADDON_DIR/dvr-config ]; then
+    cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/dvr-config ]; then
+    cp $ADDON_SYS_DIR/dvr-config $DVR_SETTINGS_FILE
+  fi
 fi
 
 TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 
 mkdir -p /var/config
-cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
+  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
+  elif [ -f $ADDON_SYS_DIR/settings-default.xml ]; then
+    cat "$ADDON_SYS_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