diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2011-01-13 22:24:05 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2011-01-13 22:24:05 (GMT) |
| commit | 9a9e9f951475a17193dc46e0f5c822449246cd72 (patch) | |
| tree | fef18b77c99ee6f1a8ac49d6239820fc279e70e6 /abs/extra | |
| parent | 0bcae6dfc24e333236543070f5b8673d37c5abee (diff) | |
| parent | 2b48e6775f2116b3a49fb81b5929cc3255f02889 (diff) | |
| download | linhes_pkgbuild-9a9e9f951475a17193dc46e0f5c822449246cd72.zip linhes_pkgbuild-9a9e9f951475a17193dc46e0f5c822449246cd72.tar.gz linhes_pkgbuild-9a9e9f951475a17193dc46e0f5c822449246cd72.tar.bz2 | |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra')
| -rwxr-xr-x | abs/extra/autofs/run | 19 | ||||
| -rw-r--r-- | abs/extra/xbmc/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/extra/xbmc/xbmc.install | 32 |
3 files changed, 33 insertions, 20 deletions
diff --git a/abs/extra/autofs/run b/abs/extra/autofs/run deleted file mode 100755 index 342ade6..0000000 --- a/abs/extra/autofs/run +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -exec 2>&1 - -. /etc/rc.conf -. /etc/rc.d/functions - -stat_runit "Starting autofs4 kernel module" && echo "" -set -e # barf if modprobe fails -/sbin/modprobe autofs4 - -stat_runit "Starting autofs automount" && echo "" -# source application-specific settings -[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs - -if [ ! -z "$TIMEOUT" ]; then - daemonoptions="--timeout=$TIMEOUT $daemonoptions" -fi - -exec /usr/sbin/automount -f $daemonoptions diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index 214b609..fbaf998 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -11,7 +11,7 @@ _prefix=/usr pkgname=xbmc pkgver=10.0 -pkgrel=4 +pkgrel=5 pkgdesc="XBMC Media Center" arch=('i686' 'x86_64') url="http://xbmc.org" diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install index a59d22b..6c58697 100644 --- a/abs/extra/xbmc/xbmc.install +++ b/abs/extra/xbmc/xbmc.install @@ -1,4 +1,17 @@ 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/bin/xbmc</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 + 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." @@ -16,6 +29,22 @@ 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/bin/xbmc</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 + [[ $(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 } @@ -23,4 +52,7 @@ 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 } |