diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
| commit | 47d70348352503e92ba694a6a683f629eaa18215 (patch) | |
| tree | 7fb6f5ec75596b795dee52cfa35e3ef00a047cfb /community/minidlna | |
| parent | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (diff) | |
| parent | 1f55cedf5ea357497d2a98eb2be78d8dab4a9665 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/hostapd/PKGBUILD
community/discid/PKGBUILD
community/dumb/PKGBUILD
community/dynamite/PKGBUILD
community/echat/PKGBUILD
community/fbdump/PKGBUILD
community/fldiff/PKGBUILD
community/flightgear/PKGBUILD
community/fonteditfs/PKGBUILD
community/freehdl/PKGBUILD
community/unclutter/PKGBUILD
community/unpaper/PKGBUILD
community/wmii/PKGBUILD
community/xkeycaps/PKGBUILD
community/xl2tpd/PKGBUILD
community/xmmsctrl/PKGBUILD
extra/gnutls/PKGBUILD
extra/inkscape/PKGBUILD
extra/ntp/PKGBUILD
extra/transmission/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/libreoffice/PKGBUILD
Diffstat (limited to 'community/minidlna')
| -rw-r--r-- | community/minidlna/PKGBUILD | 12 | ||||
| -rwxr-xr-x | community/minidlna/minidlna.rc | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index aceea031c..171d6e904 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 62999 2012-01-30 10:47:05Z spupykin $ +# $Id: PKGBUILD 65325 2012-02-21 01:35:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> # Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com> +# Contributor: Kamil Kaminski <kyle@kkaminsk.com> pkgname=minidlna -pkgver=1.0.23 -pkgrel=2 +pkgver=1.0.24 +pkgrel=1 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" @@ -18,8 +19,8 @@ backup=('etc/minidlna.conf' changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc) -md5sums=('409a36830a9ac2aaddfaff4c8b90a40f' - 'b64b8b749f1c23b3f1a2ee6d6ded07fd') +md5sums=('be9b4c91e3fcde592dc3f9828098ca0f' + '246bdfb401f26d2374ba64034adb1091') build() { cd "$srcdir/$pkgname-$pkgver" @@ -34,4 +35,5 @@ package() { install -Dm755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna mkdir -p $pkgdir/etc/conf.d echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna + echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna } diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc index 6e6f88f35..5a9d7b51c 100755 --- a/community/minidlna/minidlna.rc +++ b/community/minidlna/minidlna.rc @@ -17,7 +17,7 @@ case "$1" in if [[ -z "$PID" ]]; then rm -f /var/run/$daemon_name.pid touch /var/run/$daemon_name.pid && chown $MINIDLNA_USER:$MINIDLNA_USER /var/run/$daemon_name.pid - su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER + su -s /bin/sh -l -c "/usr/sbin/minidlna ${MINIDLNA_OPTS} $2" - $MINIDLNA_USER if [[ $? -gt 0 ]]; then stat_fail exit 1 @@ -61,6 +61,12 @@ case "$1" in $0 start ;; + rescan) + $0 stop + sleep 1 + $0 start -R + ;; + *) echo "usage: $0 {start|stop|restart|clean}" esac |