- Upgrade to slimserver 6.1.1.

- Don't quote IGNORE message.
- Don't put pid file in /var/run/slimserver/.  It's now created early
  enough to put it directly in /var/run/.

1 files changed, 2 insertions, 7 deletions

diff --git a/audio/squeezecenter/files/squeezecenter.sh.in b/audio/squeezecenter/files/squeezecenter.sh.in
index 91838a060462..d4617c1cc2a8 100644
--- a/audio/squeezecenter/files/squeezecenter.sh.in
+++ b/audio/squeezecenter/files/squeezecenter.sh.in
@@ -21,7 +21,7 @@ stop_cmd="slimserver_stop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/slimserver/${name}.pid
+pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 statedir=/var/db/slimserver
 cachedir=${statedir}/cache
@@ -47,10 +47,6 @@ slimserver_start_precmd()
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
-	if [ ! -d /var/run/slimserver ]; then
-		mkdir -p /var/run/slimserver
-		chown -R ${u}:${g} /var/run/slimserver
-	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
@@ -82,10 +78,9 @@ slimserver_stop()
 	rm -f ${pidfile}
 }
 
-# set defaults
+load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"