diff options
| author |   Nick Hadaway <raker@gentoo.org> | 2004-01-28 03:07:23 +0000 |
|---|---|---|
| committer | Nick Hadaway <raker@gentoo.org> | 2004-01-28 03:07:23 +0000 |
| commit | c556a2b7a1efec1f442c9740bdad4d82691c1cd9 (patch) | |
| tree | 3652a6177eb8742c4cc55c51506f1e3bd67c1b86 /media-sound | |
| parent | add in $S #39604 (diff) | |
| download | historical-c556a2b7a1efec1f442c9740bdad4d82691c1cd9.tar.gz historical-c556a2b7a1efec1f442c9740bdad4d82691c1cd9.tar.bz2 historical-c556a2b7a1efec1f442c9740bdad4d82691c1cd9.zip | |
A smarter init file to utilize pre- existing configs instead of the conf.d file. See bug #39270.
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/mpd/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/mpd/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpd.rc6 | 15 |
3 files changed, 18 insertions, 8 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 64deadbbc7e3..59f521d7ad2d 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mpd # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.10 2004/01/21 05:47:55 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.11 2004/01/28 03:07:23 raker Exp $ + + 27 Jan 2004; Nick Hadaway <raker@gentoo.org> files/mpd.rc6: + Added a more robust mpd.rc6 as suggested by Starz McCllelan on + bug #39270. It allows for reading in daemon config values from + /etc/mpd.conf or ~/.mpd/mpdconf instead of from conf.d. *mpd-0.9.4 (20 Jan 2004) diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 333b3ea2b570..6c0ba21499d3 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -1,10 +1,10 @@ MD5 a4fdd03b1a066bccec80f848b602e9c1 mpd-0.9.2.ebuild 1187 MD5 3162582da7d73f4a024e7f790c05e0b5 mpd-0.9.4.ebuild 1399 MD5 b1a116a3612773551b3676a70e08b001 mpd-0.9.3.ebuild 1412 -MD5 5f437e89e2d56bfe91d50acf2a3b27e0 ChangeLog 1756 +MD5 3c14b5bd72c39acf28c68d72c7d5757a ChangeLog 2009 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 92faee86ed7d721d2df12ac46f428e3f files/digest-mpd-0.9.2 62 MD5 5ec1ddd9cb2bfcd72144ade921e92e6f files/digest-mpd-0.9.3 62 MD5 b26df5fab168ac4c9bca171911b4dc8c files/digest-mpd-0.9.4 62 MD5 621f975dad77dfc05c74fd1310e0daa2 files/mpd.conf 161 -MD5 cf61965ae8a57bd5520da8228bfd6e3b files/mpd.rc6 819 +MD5 48be2b8f55fe6e146b4389e2ddbd502e files/mpd.rc6 901 diff --git a/media-sound/mpd/files/mpd.rc6 b/media-sound/mpd/files/mpd.rc6 index f9e0983ad364..86f0666d200f 100644 --- a/media-sound/mpd/files/mpd.rc6 +++ b/media-sound/mpd/files/mpd.rc6 @@ -15,20 +15,25 @@ checkconfig() { [ -z "$ERROR_FILE" ] then eerror "You need to set PORT, MUSIC_DIR, PLAYLIST_DIR," - eerror " LOG_FILE and ERROR_FILE in /etc/conf.d/mpd" + eerror "LOG_FILE and ERROR_FILE in /etc/conf.d/mpd" return 1 fi } start() { - checkconfig || return 1 ebegin "Starting Music Player Daemon" - /usr/bin/mpd ${PORT} \ + if [ -f "/etc/mpd.conf" ] || [ -f "~/.mpd/mpdconf" ] + then + /usr/bin/mpd + else + checkconfig || return 1 + /usr/bin/mpd ${PORT} \ ${MUSIC_DIR} \ ${PLAYLIST_DIR} \ ${LOG_FILE} \ ${ERROR_FILE} + fi eend $? } @@ -36,7 +41,7 @@ start() { stop() { ebegin "Stopping Music Player Daemon" - killall mpd &>/dev/null + killall mpd &>/dev/null - eend $? + eend $? } |