LinHES-config: changes for xbmc to kodi

4 files changed, 19 insertions, 15 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 5ca958d..b618689 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.3
-pkgrel=8
+pkgrel=10
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -160,14 +160,14 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
          'e959df98947eb0d2ea64ff616b61aab5'
          '2506860a416e1988934225d80d501c2c'
          'c0549457750c4f8e8038d904a0f3012a'
-         'c6110fbeaa6e68e0b80c191ced67b073'
+         'cb7abd558b6540bc5e2232866a2a42f8'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
-         '25f5dd1465890427c8297209e6e8549d'
+         '9ed75eb02683cf48fd1a79b048b2d3f2'
          '8b7dce4a3a0a281fa6656aa8781a648e'
          '4b10fff21a0274f950f97f2b61e92463'
          '824e49d9b01fed295c704ab68908b464'
          'fe5e31b833cc6707209e9d656b6eb53c'
-         '3b44e43c4290ae617431193620a4c1bb'
+         '24ef3ad4be1bf367cca40469173f19af'
          '087a0ef743bc8af915503f8773536ce4'
          '38665330aeb3a8bdf7be24857fe035bb'
          '80685e047993b00161be29e3580f3a40'
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index d1f77f9..a009d72 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -223,6 +223,8 @@ def pacinstall(pkg):
         pacinstall("web-on-linhes")
     elif pkg == "xbmc":
         pacinstall("xbmc-pvr-addons")
+    elif pkg == "kodi":
+        pacinstall("kodi-pvr-addons")
     elif pkg == "plexhometheater":
         pacinstall("plex-home-theater")
     elif pkg == "mame":
@@ -263,6 +265,8 @@ def pacremove(pkg):
         pacremove("web-on-linhes")
     elif pkg == "xbmc":
         pacremove("xbmc-pvr-addons")
+    elif pkg == "kodi":
+        pacremove("kodi-pvr-addons")
     elif pkg == "plexhometheater":
         pacremove("plex-home-theater")
     elif pkg == "mame":
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index c0ec6fa..2f3de08 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -139,19 +139,19 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
             cmd = "cp %s /etc/remote.run" %filename
             mv_common.runcmd(cmd)
 
-        #if remote has a Lircmap.xml file, use it for xbmc and plexht.
-        xbmcfile= remote_path + "/Lircmap.xml"
+        #if remote has a Lircmap.xml file, use it for kodi and plexht.
+        kodifile= remote_path + "/Lircmap.xml"
 
-        for app in ['XBMC', 'PlexHT']:
-            if app == 'XBMC':
-                userLircmap = mythhome+"/.xbmc/userdata/Lircmap.xml"
-                userdirname = ".xbmc"
+        for app in ['Kodi', 'PlexHT']:
+            if app == 'Kodi':
+                userLircmap = mythhome+"/.kodi/userdata/Lircmap.xml"
+                userdirname = ".kodi"
             elif app == 'PlexHT':
                 userLircmap = mythhome+"/.plexht/userdata/Lircmap.xml"
                 userdirname = ".plexht"
 
-            if os.path.exists(xbmcfile):
-                logging.debug("    %s lirc file present at %s", app, xbmcfile)
+            if os.path.exists(kodifile):
+                logging.debug("    %s lirc file present at %s", app, kodifile)
                 logging.info("    Setting up lirc for %s",app)
                 if not os.path.exists(mythhome+"/"+userdirname+"/userdata"):
                     logging.debug("    Creating %s/%s", mythhome, userdirname)
@@ -176,11 +176,11 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
                         cmd = ''' rm -f %s''' %(userLircmap)
                         mv_common.runcmd(cmd)
                         logging.debug("    Creating symlink for %s Lircmap.xml",app)
-                        os.symlink(xbmcfile, mythhome+"/"+userdirname+"/userdata/Lircmap.xml")
+                        os.symlink(kodifile, mythhome+"/"+userdirname+"/userdata/Lircmap.xml")
                 except:
                     pass
             else:
-                logging.debug("    %s Lircmap file %s not present", userdirname, xbmcfile)
+                logging.debug("    %s Lircmap file %s not present", userdirname, kodifile)
                 logging.debug("    Checking if %s is a symlink", userLircmap)
                 if os.path.islink(userLircmap):
                     logging.info("    Removing symlink %s", userLircmap)
diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py
index c01660e..102fa96 100755
--- a/abs/core/LinHES-config/mv_software.py
+++ b/abs/core/LinHES-config/mv_software.py
@@ -73,7 +73,7 @@ def setup_software(systemconfig, data_config):
                  "webonlinhes",
                  "huludesktop",
                  "plexhometheater",
-                 "xbmc",
+                 "kodi",
                  "dvdcss",
                  "foldingathome")