From c6fcce82e389dc4db0e3f6368cc29ea1b55d9538 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Thu, 14 Oct 2010 19:33:38 +0000
Subject: [PATCH] - unify

Changed files:
    bacula-dir.init -> 1.12
    bacula-fd.init -> 1.11
    bacula-sd.init -> 1.12
---
 bacula-dir.init | 28 +++++++++++++++-------------
 bacula-fd.init  | 30 ++++++++++++++++--------------
 bacula-sd.init  | 28 +++++++++++++++-------------
 3 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/bacula-dir.init b/bacula-dir.init
index cc85b3d..08c329b 100644
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -12,26 +12,28 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/bacula-dir ]; then
-		msg_starting "Bacula Director"
-		daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
-	else
+	if [ -f /var/lock/subsys/bacula-dir ]; then
 		msg_already_running "Bacula Director"
+		return
 	fi
+
+	msg_starting "Bacula Director"
+	daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
 }
 
 stop() {
-	if [ -f /var/lock/subsys/bacula-dir ]; then
-		# Stop daemons.
-		msg_stopping "Bacula Director"
-		killproc /usr/sbin/bacula-dir
-		RETVAL=$?
-		rm -f /var/lock/subsys/bacula-dir
-	else
+	if [ ! -f /var/lock/subsys/bacula-dir ]; then
 		msg_not_running "Bacula Director"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "Bacula Director"
+	killproc /usr/sbin/bacula-dir
+	RETVAL=$?
+	rm -f /var/lock/subsys/bacula-dir
 }
 
 RETVAL=0
diff --git a/bacula-fd.init b/bacula-fd.init
index 3dbde3d..bd8004a 100644
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # bacula	   This shell script takes care of starting and stopping
 #		   the bacula File daemon.
@@ -16,26 +16,28 @@ BACULA_FD_GROUP="bacula"
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/bacula-fd ]; then
-		msg_starting "Bacula File"
-		daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" $2 -c /etc/bacula/bacula-fd.conf
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
-	else
+	if [ -f /var/lock/subsys/bacula-fd ]; then
 		msg_already_running "Bacula File"
+		return
 	fi
+
+	msg_starting "Bacula File"
+	daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" $2 -c /etc/bacula/bacula-fd.conf
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/bacula-fd ]; then
-		# Stop daemons.
-		msg_stopping "Bacula File"
-		killproc /usr/sbin/bacula-fd
-		RETVAL=$?
-		rm -f /var/lock/subsys/bacula-fd
-	else
+	if [ ! -f /var/lock/subsys/bacula-fd ]; then
 		msg_not_running "Bacula File"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "Bacula File"
+	killproc /usr/sbin/bacula-fd
+	RETVAL=$?
+	rm -f /var/lock/subsys/bacula-fd
 }
 
 case "$1" in
diff --git a/bacula-sd.init b/bacula-sd.init
index 67b41ee..c5b891d 100644
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -16,26 +16,28 @@ BACULA_SD_GROUP="bacula"
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/bacula-sd ]; then
-		msg_starting "Bacula Storage"
-		daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" $2 -c /etc/bacula/bacula-sd.conf
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
-	else
+	if [ -f /var/lock/subsys/bacula-sd ]; then
 		msg_already_running "Bacula Storage"
+		return
 	fi
+
+	msg_starting "Bacula Storage"
+	daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" $2 -c /etc/bacula/bacula-sd.conf
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/bacula-sd ]; then
-		# Stop daemons.
-		msg_stopping "Bacula Storage"
-		killproc /usr/sbin/bacula-sd
-		RETVAL=$?
-		rm -f /var/lock/subsys/bacula-sd
-	else
+	if [ ! -f /var/lock/subsys/bacula-sd ]; then
 		msg_not_running "Bacula Storage"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "Bacula Storage"
+	killproc /usr/sbin/bacula-sd
+	RETVAL=$?
+	rm -f /var/lock/subsys/bacula-sd
 }
 
 case "$1" in
-- 
2.44.0