Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

4 files changed, 26 insertions, 3 deletions

diff --git a/abs/extra-testing/mediaserv/PKGBUILD b/abs/extra-testing/mediaserv/PKGBUILD
index c117dbe..0ed43fa 100644
--- a/abs/extra-testing/mediaserv/PKGBUILD
+++ b/abs/extra-testing/mediaserv/PKGBUILD
@@ -3,23 +3,26 @@
 
 pkgname=mediaserv
 pkgver=0.05
-pkgrel=3
-pkgdesc="On-deman transcoding server for videos, targetting the Nokia Internet Tablets."
+pkgrel=5
+pkgdesc="On-demand transcoding server for videos, targetting the Nokia Internet Tablets."
 arch=('i686' 'x86_64')
 license=('ARTISTIC')
 depends=('tablet-encode' 'perl-xml-rss')
+backup=(/myth/mediaserv/config)
 install=(mediaserv.install)
 url="http://mediautils.garage.maemo.org/tablet-encode.html"
-source=(https://garage.maemo.org/frs/download.php/2632/mediaserv-0.05.tar.gz linhes-mediaserv.tar.bz2 mediaserv.no_daemon.patch)
+source=(https://garage.maemo.org/frs/download.php/2632/mediaserv-0.05.tar.gz linhes-mediaserv.tar.bz2 mediaserv.no_daemon.patch run finish)
 
 build() {
   cd ${srcdir}/mediaserv
   patch -Np1 -i ${startdir}/src/mediaserv.no_daemon.patch || return 1
   mkdir -p $startdir/pkg/usr/bin
+  mkdir -p $startdir/pkg/etc/sv/mediaserv/supervise
   mkdir -p $startdir/pkg/usr/share/doc/mediaserv
   mkdir -p $startdir/pkg/myth/mediaserv
   mkdir -p $startdir/pkg/myth/mediaserv/media
   install -D -m755 mediaserv $startdir/pkg/usr/bin
   cp README.txt $startdir/pkg/usr/share/doc/mediaserv
   cp -a ${srcdir}/.mediaserv/* ${pkgdir}/myth/mediaserv
+  install -D -m755 ${srcdir}/run ${srcdir}/finish $startdir/pkg/etc/sv/mediaserv
 }
diff --git a/abs/extra-testing/mediaserv/finish b/abs/extra-testing/mediaserv/finish
new file mode 100644
index 0000000..f424494
--- /dev/null
+++ b/abs/extra-testing/mediaserv/finish
@@ -0,0 +1,8 @@
+#!/bin/bash
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Stopping mediaserv"
+#wait
+exec /usr/bin/killall mediaserv
diff --git a/abs/extra-testing/mediaserv/mediaserv.install b/abs/extra-testing/mediaserv/mediaserv.install
index 6fe6f08..7a26077 100644
--- a/abs/extra-testing/mediaserv/mediaserv.install
+++ b/abs/extra-testing/mediaserv/mediaserv.install
@@ -4,6 +4,8 @@ post_install() {
   ln -s /myth/pretty /myth/mediaserv/media/tv
   ln -s /myth/video /myth/mediaserv/media/video
   chown -R mythtv.mythtv /myth/mediaserv
+  add_service.sh mediaserv
+  sv start mediaserv
 }
 # arg 1:  the new package version
 # arg 2:  the old package version
@@ -13,6 +15,8 @@ post_upgrade() {
 
 # arg 1:  the old package version
 post_remove() {
+	sv stop mediaserv
+	remove_service.sh mediaserv
 	rm -fr /home/mythtv/.mediaserv
 	rm -fr /myth/mediaserv
 }
diff --git a/abs/extra-testing/mediaserv/run b/abs/extra-testing/mediaserv/run
new file mode 100644
index 0000000..82a1705
--- /dev/null
+++ b/abs/extra-testing/mediaserv/run
@@ -0,0 +1,8 @@
+#!/bin/bash
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting mediaserv"
+exec su mythtv -c "/usr/bin/mediaserv"
+wait