From 3ce90eb147c39ab18d6360742738225811457392 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 21 Aug 2012 18:17:00 -0500 Subject: mythappletrailers: converted it to use gen_is_xml.py and msg_client.py --- abs/extra/mythappletrailers/PKGBUILD | 10 +++++++--- abs/extra/mythappletrailers/appletrailers_is.conf | 8 ++++++++ abs/extra/mythappletrailers/loading.sh | 19 ++++++++++--------- .../mythappletrailers/mythappletrailers.install | 22 ++++++---------------- 4 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 abs/extra/mythappletrailers/appletrailers_is.conf diff --git a/abs/extra/mythappletrailers/PKGBUILD b/abs/extra/mythappletrailers/PKGBUILD index 2f36a4d..56ff18c 100644 --- a/abs/extra/mythappletrailers/PKGBUILD +++ b/abs/extra/mythappletrailers/PKGBUILD @@ -11,7 +11,7 @@ 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') +'trailers' 'loading.sh' 'fix_aple_url.sh' 'appletrailers_is.conf') build() { mkdir -p $startdir/pkg/usr/bin @@ -27,9 +27,13 @@ build() { cp loading.sh $startdir/pkg/usr/bin/ cp trailers $startdir/pkg/etc/cron.daily/ install -m755 $srcdir/fix_aple_url.sh $pkgdir/usr/bin + #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' 'c7da92600afe2a3b1f564764500315a0' '5fdd4aa17b9c1e77b272437ae42a1827' - 'ece3c5f8a605b6e2270c6f7671705631' - 'a2349f844e47fd95a672739177ca44ff') + 'aff3d1ce845ce8364d336032788118f7' + 'a2349f844e47fd95a672739177ca44ff' + '341eb4f98b70b51b9420f58051c8df6a') diff --git a/abs/extra/mythappletrailers/appletrailers_is.conf b/abs/extra/mythappletrailers/appletrailers_is.conf new file mode 100644 index 0000000..1ba4379 --- /dev/null +++ b/abs/extra/mythappletrailers/appletrailers_is.conf @@ -0,0 +1,8 @@ + + + + diff --git a/abs/extra/mythappletrailers/loading.sh b/abs/extra/mythappletrailers/loading.sh index e4e85fc..869c326 100755 --- a/abs/extra/mythappletrailers/loading.sh +++ b/abs/extra/mythappletrailers/loading.sh @@ -1,12 +1,13 @@ #!/bin/bash +msg_client.py "Loading . . . " -. /etc/osd_cat.cfg || { - color=yellow - outline=2 - outlinecolour=black - shadow=0 - shadowcolour=black - font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" -} +#. /etc/osd_cat.cfg || { +# color=yellow +# outline=2 +# outlinecolour=black +# shadow=0 +# shadowcolour=black +# font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" +#} -echo -e "Loading . . . " | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font +#echo -e "Loading . . . " | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font diff --git a/abs/extra/mythappletrailers/mythappletrailers.install b/abs/extra/mythappletrailers/mythappletrailers.install index 96f6717..452fb16 100644 --- a/abs/extra/mythappletrailers/mythappletrailers.install +++ b/abs/extra/mythappletrailers/mythappletrailers.install @@ -1,35 +1,25 @@ # arg 1: the new package version post_install() { ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml - mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp - grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp - echo "" >> /tmp/is.xml.tmp - echo " " >> /tmp/is.xml.tmp - echo "" >> /tmp/is.xml.tmp - echo "" >> /tmp/is.xml.tmp - echo "" >> /tmp/is.xml.tmp - mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml + /usr/LH/bin/gen_is_xml.py } # arg 1: the new package version # arg 2: the old package version post_upgrade() { + /usr/LH/bin/gen_is_xml.py if [ -e /usr/share/mythtv/themes/defaultmenu/appletrailer.xml ] then exit else - ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml + ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml fi } # arg 1: the old package version post_remove() { - rm -fr /usr/share/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaulmenu/mythappletrailer.xml - mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp - sed -e '/\#MythAp/,/\#MythAp/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml + rm -fr /usr/share/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaulmenu/mythappletrailer.xml + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp + /usr/LH/bin/gen_is_xml.py } op=$1 -- cgit v0.12