3 files changed, 13 insertions, 32 deletions
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index 07c930f..10c3bd8 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,2 +1,4 @@
 7/5/11 - chw - Removed libpulse and lsb-release dep.
 8/8/11 - mjh - Add patch for Snapstream Firefly remote. Ref #728
+8/23/12 -jm -Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
+
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index c1010a4..46ac150 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -1,17 +1,5 @@
 post_install() {
-  mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp
-  grep -v -e /mythmenu /tmp/library.xml > /tmp/library.xml.tmp
-  echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
-  echo "   <button>" >> /tmp/library.xml.tmp
-  echo "     <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp
-  echo "     <text>Launch XBMC</text>" >> /tmp/library.xml.tmp
-  echo "     <action>EXEC /usr/LH/bin/xbmc.sh</action>" >> /tmp/library.xml.tmp 
-  echo "   </button>" >> /tmp/library.xml.tmp
-  echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
-  echo "" >> /tmp/library.xml.tmp
-  echo "</mythmenu>" >> /tmp/library.xml.tmp
-  mv /tmp/library.xml.tmp /usr/share/mythtv/themes/defaultmenu/library.xml
-  
+  gen_lib_xml.py 
   echo ">> If XBMC won't start, but just segfaults, double check your X.Org config."
   echo ">> The display depth has to be at least 24-bit, ie"
   echo ">> set \"DefaultDepth 24\" under the \"Screen\" section of your xorg.conf file."
@@ -29,22 +17,7 @@ post_install() {
 }
 
 post_upgrade() {
-  mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp/library.xml.tmp
-  sed -e '/\#XBMC/,/\#XBMC/d' < /tmp/library.xml.tmp > /usr/share/mythtv/themes/defaultmenu/library.xml
-
-  mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp
-  grep -v -e /mythmenu /tmp/library.xml > /tmp/library.xml.tmp
-  echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
-  echo "   <button>" >> /tmp/library.xml.tmp
-  echo "     <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp
-  echo "     <text>Launch XBMC</text>" >> /tmp/library.xml.tmp
-  echo "     <action>EXEC /usr/LH/bin/xbmc.sh</action>" >> /tmp/library.xml.tmp 
-  echo "   </button>" >> /tmp/library.xml.tmp
-  echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
-  echo "" >> /tmp/library.xml.tmp
-  echo "</mythmenu>" >> /tmp/library.xml.tmp
-  mv /tmp/library.xml.tmp /usr/share/mythtv/themes/defaultmenu/library.xml
-  
+  gen_lib_xml.py 
   [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
 }
@@ -52,7 +25,5 @@ post_upgrade() {
 post_remove() {
   [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
-  
-  mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp/library.xml.tmp
-  sed -e '/\#XBMC/,/\#XBMC/d' < /tmp/library.xml.tmp > /usr/share/mythtv/themes/defaultmenu/library.xml
+  gen_lib_xml.py  
 }
diff --git a/abs/extra/xbmc/xbmc_lib.conf b/abs/extra/xbmc/xbmc_lib.conf
new file mode 100644
index 0000000..df88abb
--- /dev/null
+++ b/abs/extra/xbmc/xbmc_lib.conf
@@ -0,0 +1,8 @@
+<!--#XBMC-->
+    <button>
+       <type>MENU_XBMC</type>
+       <text>Launch XBMC</text>
+       <action>EXEC /usr/bin/xbmc</action>
+    </button>
+<!--#XBMC--> 
+