From 305a71c2873174a69c3fa5c8bcfa575bbbc2f146 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 20 Oct 2014 04:47:16 +0200
Subject: [PATCH] [xbmc-rebrand] service.openelec.settings: add patch to rename
 XBMC's config dir; move install location, rename XBMC config dir in scripts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../service.openelec.settings/package.mk      | 12 +++++-----
 ...rvice.openelec.settings-xbmc-rebrand.patch | 24 +++++++++++++++++++
 .../scripts/backup-restore                    |  2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 packages/mediacenter/service.openelec.settings/patches/service.openelec.settings-xbmc-rebrand.patch

diff --git a/packages/mediacenter/service.openelec.settings/package.mk b/packages/mediacenter/service.openelec.settings/package.mk
index c2fcb0695e..c4bbabfaab 100644
--- a/packages/mediacenter/service.openelec.settings/package.mk
+++ b/packages/mediacenter/service.openelec.settings/package.mk
@@ -44,8 +44,8 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/share/xbmc/addons/service.openelec.settings
-    cp -R * $INSTALL/usr/share/xbmc/addons/service.openelec.settings
+  mkdir -p $INSTALL/usr/share/kodi/addons/service.openelec.settings
+    cp -R * $INSTALL/usr/share/kodi/addons/service.openelec.settings
 
   mkdir -p $INSTALL/usr/lib/openelec
     cp $PKG_DIR/scripts/* $INSTALL/usr/lib/openelec
@@ -55,11 +55,11 @@ makeinstall_target() {
       rm -f resources/lib/modules/bluetooth.py
     fi
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/xbmc/addons/service.openelec.settings/resources/lib/ -f
-  rm -rf `find $INSTALL/usr/share/xbmc/addons/service.openelec.settings/resources/lib/ -name "*.py"`
+  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.openelec.settings/resources/lib/ -f
+  rm -rf `find $INSTALL/usr/share/kodi/addons/service.openelec.settings/resources/lib/ -name "*.py"`
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/xbmc/addons/service.openelec.settings/oe.py -f
-  rm -rf $INSTALL/usr/share/xbmc/addons/service.openelec.settings/oe.py
+  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.openelec.settings/oe.py -f
+  rm -rf $INSTALL/usr/share/kodi/addons/service.openelec.settings/oe.py
 }
 
 post_install() {
diff --git a/packages/mediacenter/service.openelec.settings/patches/service.openelec.settings-xbmc-rebrand.patch b/packages/mediacenter/service.openelec.settings/patches/service.openelec.settings-xbmc-rebrand.patch
new file mode 100644
index 0000000000..c637e764a3
--- /dev/null
+++ b/packages/mediacenter/service.openelec.settings/patches/service.openelec.settings-xbmc-rebrand.patch
@@ -0,0 +1,24 @@
+diff -Naur service.openelec.settings-0.4.3/defaults.py service.openelec.settings-0.4.3.patch/defaults.py
+--- service.openelec.settings-0.4.3/defaults.py	2014-09-10 11:38:24.000000000 +0200
++++ service.openelec.settings-0.4.3.patch/defaults.py	2014-10-20 03:53:04.451032921 +0200
+@@ -29,7 +29,7 @@
+ ################################################################################
+ # Base 
+ ################################################################################
+-XBMC_USER_HOME = os.environ.get("XBMC_USER_HOME", "/storage/.xbmc")
++XBMC_USER_HOME = os.environ.get("XBMC_USER_HOME", "/storage/.kodi")
+ CONFIG_CACHE = os.environ.get("CONFIG_CACHE", "/storage/.cache")
+ USER_CONFIG = os.environ.get("USER_CONFIG", "/storage/.config")
+ 
+diff -Naur service.openelec.settings-0.4.3/oe.py service.openelec.settings-0.4.3.patch/oe.py
+--- service.openelec.settings-0.4.3/oe.py	2014-09-10 11:38:24.000000000 +0200
++++ service.openelec.settings-0.4.3.patch/oe.py	2014-10-20 03:52:36.499991207 +0200
+@@ -1025,7 +1025,7 @@
+ VERSION        = load_file('/etc/version')    
+ BUILD          = load_file('/etc/build')
+ DOWNLOAD_DIR   = "/storage/downloads"
+-XBMC_USER_HOME = os.environ.get('XBMC_USER_HOME', '/storage/.xbmc')
++XBMC_USER_HOME = os.environ.get('XBMC_USER_HOME', '/storage/.kodi')
+ CONFIG_CACHE   = os.environ.get('CONFIG_CACHE', '/storage/.cache')
+ USER_CONFIG    = os.environ.get('USER_CONFIG', '/storage/.config')
+ TEMP           = '%s/temp/' % XBMC_USER_HOME
diff --git a/packages/mediacenter/service.openelec.settings/scripts/backup-restore b/packages/mediacenter/service.openelec.settings/scripts/backup-restore
index e72bd36353..0ebeaf6934 100755
--- a/packages/mediacenter/service.openelec.settings/scripts/backup-restore
+++ b/packages/mediacenter/service.openelec.settings/scripts/backup-restore
@@ -26,7 +26,7 @@ if [ -e "$BACKUP_FILE" ] ; then
   if [ $ret -eq 0 ] ; then
     echo OK
     echo -en "restoring.. this may take long time to complete, please wait.. "
-    rm -rf /storage/.xbmc &>/dev/null
+    rm -rf /storage/.kodi &>/dev/null
     rm -rf /storage/.cache &>/dev/null
     rm -rf /storage/.config &>/dev/null
     tar xf $BACKUP_FILE -C / &>/dev/null