Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

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

@@ -24,10 +24,7 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.boblightd"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.boblightd"
-
-mkdir -p $ADDON_HOME
+oe_setup_addon service.multimedia.boblightd
 
 chmod a+x $ADDON_DIR/bin/*
 
@@ -40,4 +37,4 @@ if [ -x $ADDON_DIR/bin/boblight-X11 -a -e $ADDON_HOME/boblight.X11 ] ; then
   boblight-X11 -f >/dev/null 2>&1
 fi
 
-exec boblightd -c $ADDON_HOME/boblight.conf > $ADDON_HOME/service.log 2>&1
+exec boblightd -c $ADDON_HOME/boblight.conf > $ADDON_LOG_FILE 2>&1

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

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)

packages/addons/service/multimedia/vdr-addon/addon

@@ -22,9 +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
-
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/channels.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -22,6 +22,8 @@
 
 . /etc/profile
 
+oe_setup_addon service.multimedia.vdr-addon
+
 check_tmpfs_mount() {
   grep " /var/run/vdr " /proc/mounts >/dev/null
   if [ $? -ne 0 ] ; then
@@ -47,30 +49,16 @@ OSDSkin = sttng
 MYDATA
 }
 
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
-LOG_FILE="$ADDON_HOME/service.log"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-
 ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
 
 chmod a+x $ADDON_DIR/bin/*
 
-if [ ! -f "$ADDON_SETTINGS" ]; then
-  mkdir -p $ADDON_HOME
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
-fi
-
 ADDON_CACHE_DIR="$ADDON_HOME/cache"
 if [ ! -f "$ADDON_CACHE_DIR" ]; then
   mkdir -p $ADDON_CACHE_DIR
 fi
 
-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
-
 #handle epgsources
 mkdir -p /var/lib/epgsources
 mkdir -p $ADDON_HOME/config/epgsources
@@ -83,9 +71,6 @@ for source in `find $ADDON_HOME/config/epgsources -type f`; do
   cp $source /var/lib/epgsources
 done
 
-. /var/config/vdr.conf.default
-. /var/config/vdr.conf
-
 VDR_ARG="-g /tmp --no-kbd"
 if [ "$DEBUG" = "yes" ]; then
   VDR_ARG="$VDR_ARG --log=3"
@@ -175,4 +160,4 @@ fi
 
 check_tmpfs_mount
 fix_config
-eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG &>$LOG_FILE
+eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG

packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power

@@ -22,10 +22,9 @@
 
 . /etc/profile
 
+oe_setup_addon service.multimedia.vdr-addon
+
 SERVICE="service.multimedia.vdr-addon.service"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'`
 
 case "$1" in
   pre)
@@ -45,3 +44,4 @@ case "$1" in
     fi
     ;;
 esac
+

packages/mediacenter/xbmc/profile.d/03-addons.conf

@@ -0,0 +1,42 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+oe_setup_addon() {
+  if [ ! -z $1 ] ; then
+    DEF="/storage/.xbmc/addons/$1/settings-default.xml"
+    CUR="/storage/.xbmc/userdata/addon_data/$1/settings.xml"
+
+    # copy defaults
+    if [ -f "$DEF" -a ! -f "$CUR" ] ; then
+      cp "$DEF" "$CUR"
+    fi
+
+    # parse config
+    [ -f "$DEF" ] && eval $(cat "$DEF" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d')
+    [ -f "$CUR" ] && eval $(cat "$CUR" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d')
+
+    # export some useful variables
+    ADDON_DIR="$HOME/.xbmc/addons/$1"
+    ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$1"
+    ADDON_LOG_FILE="$ADDON_HOME/service.log"
+
+    [ ! -d $ADDON_HOME ] && mkdir -p $ADDON_HOME
+  fi
+}