Update contributed scripts to use autoconf substitution for the

paths to binaries, configuration files and local state files.

2 files changed, 22 insertions, 19 deletions

diff --git a/contrib/suse/bbackupd b/contrib/suse/bbackupd.in
index 4dd94154..d3a5659e 100644
--- a/contrib/suse/bbackupd
+++ b/contrib/suse/bbackupd.in
@@ -7,7 +7,7 @@
 # RELEASED AND PROVIDED TO YOU UNDER THE SAME LICENCE AS THE BOXBACKUP
 # SUITE OF PROGRAMS. LICENCE MAY BE VIEWED HERE:
 #
-# http://www.fluffy.co.uk/boxbackup/license.html
+# http://www.boxbackup.org/license.html
 ######################################################################
 #
 # /etc/init.d/bbackupd
@@ -28,7 +28,7 @@
 ### END INIT INFO
 
 # Check for missing binaries (stale symlinks should not happen)
-BBACKUPD_BIN=/usr/sbin/bbackupd
+BBACKUPD_BIN=@bindir_expanded@/bbackupd
 if [ ! -x $BBACKUPD_BIN ] ; then
 	echo "$BBACKUPD_BIN not installed"
 	exit 5
@@ -90,7 +90,9 @@ case "$1" in
 		;;
 
     probe)
-		test /etc/box/bbackupd.conf -nt /var/run/bbackupd.pid && echo reload
+		test @sysconfdir_expanded@/box/bbackupd.conf \
+			-nt @localstatedir_expanded@/bbackupd.pid \
+		&& echo reload
 		;;
 
     *)
diff --git a/contrib/suse/bbstored b/contrib/suse/bbstored.in
index 1824dda7..e8c74278 100644
--- a/contrib/suse/bbstored
+++ b/contrib/suse/bbstored.in
@@ -7,15 +7,15 @@
 # RELEASED AND PROVIDED TO YOU UNDER THE SAME LICENCE AS THE BOXBACKUP
 # SUITE OF PROGRAMS. LICENCE MAY BE VIEWED HERE:
 #
-# http://www.fluffy.co.uk/boxbackup/license.html
+# http://www.boxbackup.org/license.html
 ######################################################################
 #
-# /etc/init.d/bbackupd
+# /etc/init.d/bbstored
 #   and its symbolic link
-# /(usr/)sbin/rcbbackupd
+# /(usr/)sbin/rcbbstored
 #
 ### BEGIN INIT INFO
-# Provides:          bbackupd
+# Provides:          bbstored
 # Required-Start:    $named $network $local_fs $syslog
 # X-UnitedLinux-Should-Start: $time ypbind sendmail
 # Required-Stop:     $named $network $localfs $syslog
@@ -23,15 +23,15 @@
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
 # Short-Description: BoxBackup server side daemon
-# Description: Client daemon for the BoxBackup software       
-#	that allows you to communicate with a bbstored server.
+# Description: Server daemon for the BoxBackup software,
+#	to which bbackupd clients connect.
 ### END INIT INFO
 # 
 
 # Check for missing binaries (stale symlinks should not happen)
-BBACKUPD_BIN=/usr/sbin/bbstored
-if [ ! -x $BBACKUPD_BIN ] ; then
-	echo "$BBACKUPD_BIN not installed"
+BBSTORED_BIN=@bindir_expanded@/bbstored
+if [ ! -x $BBSTORED_BIN ] ; then
+	echo "$BBSTORED_BIN not installed"
 	exit 5
 fi
 
@@ -43,13 +43,13 @@ rc_reset
 case "$1" in
 	start)
 	echo -n "Starting bbstored "
-	startproc $BBACKUPD_BIN
+	startproc $BBSTORED_BIN
 	rc_status -v
 	;;
 
     stop)
-	echo -n "Shutting down bstored "
-	killproc -TERM $BBACKUPD_BIN
+	echo -n "Shutting down bbstored "
+	killproc -TERM $BBSTORED_BIN
 	rc_status -v
 	;;
 
@@ -74,24 +74,25 @@ case "$1" in
 
     force-reload)
 	echo -n "Reload service bbstored "
-	killproc -HUP $BBACKUPD_BIN
+	killproc -HUP $BBSTORED_BIN
 	rc_status -v
 	;;
 
     reload)
 	echo -n "Reload service bbstored  "
-	killproc -HUP $BBACKUPD_BIN
+	killproc -HUP $BBSTORED_BIN
 	rc_status -v
 	;;
 
     status)
 	echo -n "Checking for service bbstored "
-	checkproc $BBACKUPD_BIN
+	checkproc $BBSTORED_BIN
 	rc_status -v
 	;;
 
     probe)
-	test /etc/box/bbstored.conf -nt /var/run/bbstored.pid && echo reload
+	test @sysconfdir_expanded@/box/bbstored.conf \
+		-nt @localstatedir_expanded@/bbstored.pid && echo reload
 	;;
 
     *)