mythappletrails: fixup a merge gone bad. This adds the playall/random menus and also fixes the loading.sh file

2 files changed, 24 insertions, 13 deletions

diff --git a/abs/extra/mythappletrailers/PKGBUILD b/abs/extra/mythappletrailers/PKGBUILD
index 57b6b72..140c8b7 100644
--- a/abs/extra/mythappletrailers/PKGBUILD
+++ b/abs/extra/mythappletrailers/PKGBUILD
@@ -3,27 +3,30 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=45
+pkgrel=46
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.mythtv.org/wiki/index.php/Myth_Apple_Trailers"
 depends=('php' 'mythtv' 'mplayer-wrapper')
 install=mythappletrailers.install
-source=('myth_trailers_grabber' 'appletrailer.xml'
-'trailers' 'loading.sh' 'fix_aple_url.sh'
-'play_trailer.sh' 'gen_trailer_menu.sh' 'all_trailers' 'shuffle_trailers')
-
+source=('myth_trailers_grabber' 'appletrailer.xml'\
+        'trailers' 'loading.sh' 'fix_aple_url.sh'\
+        'play_trailer.sh' 'gen_trailer_menu.sh'\
+        'all_trailers' 'shuffle_trailers'\
+        'appletrailers_is.conf')
+#. /usr/MythVantage/bin/install_functions.sh
 build() {
+  MYTHHOME="/home/mythtv"
   mkdir -p $startdir/pkg/usr/bin
   mkdir -p $startdir/pkg/etc/cron.daily
-  mkdir -p $startdir/pkg/home/mythtv/
+  mkdir -p $startdir/pkg/$MYTHHOME
   mkdir -p $startdir/pkg/usr/share/mythtv/
-  cp appletrailer.xml  $startdir/pkg/home/mythtv/appletrailer.xml
-  chown 1000:1000 $startdir/pkg/home/mythtv/appletrailer.xml
+  cp appletrailer.xml  $startdir/pkg/$MYTHHOME/appletrailer.xml
+  chown 1000:1000 $startdir/pkg/$MYTHHOME/appletrailer.xml
   chmod 755 trailers
   chmod 755 myth_trailers_grabber
-  chmod 755 loading.sh 
+  chmod 755 loading.sh
   cp myth_trailers_grabber $startdir/pkg/usr/bin/
   cp loading.sh $startdir/pkg/usr/bin/
   cp trailers $startdir/pkg/etc/cron.daily/
@@ -32,14 +35,22 @@ build() {
   install -m755 $srcdir/gen_trailer_menu.sh $pkgdir/usr/bin
   install -m644 $srcdir/all_trailers $pkgdir/home/mythtv
   install -m644 $srcdir/shuffle_trailers $pkgdir/home/mythtv
-  chown 1000:1000 $startdir/pkg/home/mythtv/*_trailers
+  chown 1000:1000 $startdir/pkg/$MYTHHOME/*_trailers
+
+  #add in file for gen_is.xml
+  install -D -m0744 ${srcdir}/appletrailers_is.conf ${pkgdir}/etc/gen_is_xml.d/appletrailers_is.conf
 }
+
+
+
+
 md5sums=('336e68953d0e1e8a0c7a4990f8d43a2b'
          'be0d071981e5536f24aaf67545a96cc5'
          'a508f2de763f5bec5b4549885c062c8a'
-         'ece3c5f8a605b6e2270c6f7671705631'
+         'f072ec9c3d78b107e25039758fd5b378'
          'a2349f844e47fd95a672739177ca44ff'
          '14f153c1efa7ae4e192d87010cbf9f7c'
          '3e9d8014a0e76e2cf8057291d20c9291'
          '7af1e58dfab2772dbb6f339481ae8d5d'
-         'd26681921482cbf334b43f700adf0d29')
+         'd26681921482cbf334b43f700adf0d29'
+         '341eb4f98b70b51b9420f58051c8df6a')
diff --git a/abs/extra/mythappletrailers/loading.sh b/abs/extra/mythappletrailers/loading.sh
index 869c326..55321fa 100755
--- a/abs/extra/mythappletrailers/loading.sh
+++ b/abs/extra/mythappletrailers/loading.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-msg_client.py "Loading . . . "
+msg_client.py  --timeout 10 --msg "Loading . . . "
 
 #. /etc/osd_cat.cfg || {
 #    color=yellow