diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-10 10:21:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-10 10:21:53 -0300 |
| commit | 9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (patch) | |
| tree | a9c2e47a6d2ce00fda6c302e09aba390accc1407 /community/mldonkey | |
| parent | 96790e4d7e2c3a76ee2ee0c5d703b8144049532c (diff) | |
| parent | 4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/blender/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/root/PKGBUILD
community-testing/ted/PKGBUILD
extra/cpufrequtils/PKGBUILD
extra/libraw1394/PKGBUILD
extra/musicbrainz/PKGBUILD
extra/pm-utils/PKGBUILD
extra/re2c/PKGBUILD
extra/zip/PKGBUILD
multilib/lib32-expat/PKGBUILD
multilib/lib32-flac/PKGBUILD
multilib/lib32-fontconfig/PKGBUILD
multilib/lib32-giflib/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib/PKGBUILD
multilib/lib32-json-c/PKGBUILD
multilib/lib32-lcms/PKGBUILD
multilib/lib32-libao/PKGBUILD
multilib/lib32-libasyncns/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-libice/PKGBUILD
multilib/lib32-libmikmod/PKGBUILD
multilib/lib32-libsm/PKGBUILD
multilib/lib32-libsndfile/PKGBUILD
multilib/lib32-libstdc++5/PKGBUILD
multilib/lib32-libvorbis/PKGBUILD
multilib/lib32-libxau/PKGBUILD
multilib/lib32-libxcomposite/PKGBUILD
multilib/lib32-libxdamage/PKGBUILD
multilib/lib32-libxdmcp/PKGBUILD
multilib/lib32-libxft/PKGBUILD
multilib/lib32-libxinerama/PKGBUILD
multilib/lib32-libxml2/PKGBUILD
multilib/lib32-libxmu/PKGBUILD
multilib/lib32-libxrender/PKGBUILD
multilib/lib32-libxss/PKGBUILD
multilib/lib32-libxt/PKGBUILD
multilib/lib32-libxtst/PKGBUILD
multilib/lib32-libxv/PKGBUILD
multilib/lib32-libxvmc/PKGBUILD
multilib/lib32-libxxf86vm/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openal/PKGBUILD
multilib/lib32-speex/PKGBUILD
testing/kdelibs3/PKGBUILD
testing/kmod/PKGBUILD
testing/php/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/mldonkey')
| -rw-r--r-- | community/mldonkey/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/mldonkey/mldonkeyd | 44 |
2 files changed, 34 insertions, 16 deletions
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index b7758eb92..6b420707f 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63664 2012-02-05 12:04:35Z ibiru $ +# $Id: PKGBUILD 64114 2012-02-08 23:57:08Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey pkgver=3.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64' 'mips64el') url="http://mldonkey.sourceforge.net/" @@ -41,6 +41,6 @@ package() { install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" } md5sums=('072726d158ba1e936c554be341e7ceff' - '75e4b6c7fb282f7de15a8d5478f3bd70' + '9e90003a012cf17b548dcc647961ffa6' '1f86d92db51c62cded0e6f3833057dee' '1de3266caa49f82bee73ba891eea12cf') diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd index 6a458d68e..533aa751c 100644 --- a/community/mldonkey/mldonkeyd +++ b/community/mldonkey/mldonkeyd @@ -1,8 +1,8 @@ #!/bin/bash . /etc/rc.conf -. /etc/conf.d/mldonkey . /etc/rc.d/functions +. /etc/conf.d/mldonkey if [ -z $MLDUSER ] ; then echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ." @@ -27,7 +27,10 @@ fi PIDDIR="/var/run/mldonkey" PIDFILE="$PIDDIR/mlnet.pid" -PID=$(cat $PIDFILE 2>/dev/null) + +getPID() { + echo $(pgrep -u "$MLDUSER" mlnet 2>/dev/null); +} case "$1" in start) @@ -46,19 +49,34 @@ case "$1" in stat_done fi ;; - stop) - stat_busy "Stopping MLDonkey" - [ ! -z $PID ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mldonkey - stat_done - fi - ;; + stop) + stat_busy "Stopping MLDonkey" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f $PIDFILE &>/dev/null + rm_daemon mldonkey + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; restart) $0 stop - sleep 1 $0 start ;; *) |