Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 171198 | Differences between
and this patch

Collapse All | Expand All

(-)files/jabberd-2.1.6.init (-9 / +10 lines)
Lines 9-20 Link Here
9
	provide jabber-server
9
	provide jabber-server
10
}
10
}
11
11
12
function stopJabberServices() {
12
stopJabberServices() {
13
13
14
	eindent
14
	eindent
15
	for pidfile in /var/run/jabber/*.pid; do
15
	for pidfile in /var/run/jabber/*.pid; do
16
		if [[ -f "${pidfile}" ]]; then
16
		if [ -f "${pidfile}" ]; then
17
			service=$(basename ${pidfile/.pid/})
17
			service=$(basename ${pidfile} .pid)
18
			ebegin "Stopping ${service}"
18
			ebegin "Stopping ${service}"
19
			start-stop-daemon \
19
			start-stop-daemon \
20
				--stop \
20
				--stop \
Lines 29-42 Link Here
29
start() {
29
start() {
30
30
31
	einfo "Starting Jabber Server ..."
31
	einfo "Starting Jabber Server ..."
32
	local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
32
	local services
33
	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
33
	eindent
34
	eindent
34
	for service in ${services}; do
35
	for service in ${services}; do
35
36
36
		cfgfile=${service/*:/}
37
		cfgfile=$(echo ${service} | cut -d ':' -f 2)
37
		service=${service/:*/}
38
		service=$(echo ${service} | cut -d ':' -f 1)
38
		if [[ ! -f "${cfgfile}" ]]; then
39
		if [ ! -f "${cfgfile}" ]; then
39
			if [[ -f "/etc/jabber/${service}.xml" ]]; then
40
			if [ -f "/etc/jabber/${service}.xml" ]; then
40
				cfgfile="/etc/jabber/${service}.xml"
41
				cfgfile="/etc/jabber/${service}.xml"
41
			else
42
			else
42
				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
43
				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
Lines 47-53 Link Here
47
48
48
		executable=/usr/bin/${service}
49
		executable=/usr/bin/${service}
49
50
50
		if [[ ! -f "${executable}" ]]; then
51
		if [ ! -f "${executable}" ]; then
51
			eerror "Can't find executable: ${executable}"
52
			eerror "Can't find executable: ${executable}"
52
			stopJabberServices
53
			stopJabberServices
53
			return 1
54
			return 1

Return to bug 171198