From 98fea665912cb23f410ba90d00e50ee35a808081 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 12 Nov 2010 09:47:46 +0100
Subject: [PATCH] Ensure that bat.conf is updated when bconsole.conf is

---
 regress/scripts/copy-2client-confs     | 1 +
 regress/scripts/copy-2disk-confs       | 1 +
 regress/scripts/copy-2disk-drive-confs | 2 +-
 regress/scripts/copy-2drive-confs      | 1 +
 regress/scripts/copy-2tape-confs       | 1 +
 regress/scripts/copy-btape-confs       | 1 +
 regress/scripts/copy-confs             | 1 +
 regress/scripts/copy-crypto-confs      | 1 +
 regress/scripts/copy-fifo-confs        | 1 +
 regress/scripts/copy-migration-confs   | 1 +
 regress/scripts/copy-plugin-confs      | 1 +
 regress/scripts/copy-strip-confs       | 1 +
 regress/scripts/copy-tape-confs        | 1 +
 regress/scripts/copy-test-confs        | 9 +++++----
 regress/scripts/copy-testa-confs       | 1 +
 regress/scripts/copy-tls-auth-conf     | 1 +
 regress/scripts/copy-tls-confs         | 1 +
 regress/scripts/copy-virtual-confs     | 1 +
 regress/scripts/copy-win32-confs       | 1 +
 19 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/regress/scripts/copy-2client-confs b/regress/scripts/copy-2client-confs
index 4b674508fe..e24362ea3f 100755
--- a/regress/scripts/copy-2client-confs
+++ b/regress/scripts/copy-2client-confs
@@ -3,6 +3,7 @@
 /bin/cp -f scripts/bacula-sd-2disk-drive.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
diff --git a/regress/scripts/copy-2disk-confs b/regress/scripts/copy-2disk-confs
index 87790955f0..9b9aee3668 100755
--- a/regress/scripts/copy-2disk-confs
+++ b/regress/scripts/copy-2disk-confs
@@ -6,6 +6,7 @@
 /bin/cp -f scripts/bacula-sd-2disk.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
diff --git a/regress/scripts/copy-2disk-drive-confs b/regress/scripts/copy-2disk-drive-confs
index 7a5dcd30ea..6fb08807e9 100755
--- a/regress/scripts/copy-2disk-drive-confs
+++ b/regress/scripts/copy-2disk-drive-confs
@@ -3,8 +3,8 @@
 /bin/cp -f scripts/bacula-sd-2disk-drive.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
 sed -f ${outf} tmp/1 >bin/bacula-dir.conf
-
diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs
index cccce99b00..5f81b7dd41 100755
--- a/regress/scripts/copy-2drive-confs
+++ b/regress/scripts/copy-2drive-confs
@@ -3,6 +3,7 @@
 /bin/cp -f scripts/bacula-sd-2drive.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs
index 73f2eb4493..871a473315 100755
--- a/regress/scripts/copy-2tape-confs
+++ b/regress/scripts/copy-2tape-confs
@@ -3,6 +3,7 @@
 /bin/cp -f scripts/bacula-sd-2tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
diff --git a/regress/scripts/copy-btape-confs b/regress/scripts/copy-btape-confs
index c3a9d8ca86..b1bec0fc2d 100755
--- a/regress/scripts/copy-btape-confs
+++ b/regress/scripts/copy-btape-confs
@@ -3,5 +3,6 @@
 /bin/cp -f ${rscripts}/bacula-sd-btape.conf ${scripts}/bacula-sd.conf
 /bin/cp -f ${rscripts}/test-bacula-fd.conf ${scripts}/bacula-fd.conf
 /bin/cp -f ${rscripts}/test-console.conf ${scripts}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${scripts}/bat.conf
 
 ${rscripts}/set_tape_options
diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs
index 92c59a9cf8..88906ab142 100755
--- a/regress/scripts/copy-confs
+++ b/regress/scripts/copy-confs
@@ -4,5 +4,6 @@
 /bin/cp -f ${rscripts}/bacula-sd.conf ${scripts}/bacula-sd.conf
 /bin/cp -f ${rscripts}/bacula-fd.conf ${scripts}/bacula-fd.conf
 /bin/cp -f ${rscripts}/bconsole.conf ${scripts}/bconsole.conf
+/bin/cp -f ${rscripts}/bconsole.conf ${scripts}/bat.conf
 
 ${rscripts}/set_tape_options
diff --git a/regress/scripts/copy-crypto-confs b/regress/scripts/copy-crypto-confs
index c981df30fb..df75519d0d 100755
--- a/regress/scripts/copy-crypto-confs
+++ b/regress/scripts/copy-crypto-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/crypto-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 /bin/cp -f scripts/cryptokeypair.pem bin/cryptokeypair.pem
 /bin/cp -f scripts/master2048.cert bin/master2048.cert
diff --git a/regress/scripts/copy-fifo-confs b/regress/scripts/copy-fifo-confs
index 7e5dbb5ec9..d41b253d59 100755
--- a/regress/scripts/copy-fifo-confs
+++ b/regress/scripts/copy-fifo-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/bacula-sd-fifo.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 
 scripts/set_tape_options
diff --git a/regress/scripts/copy-migration-confs b/regress/scripts/copy-migration-confs
index c7680bc40e..3add9a67b0 100755
--- a/regress/scripts/copy-migration-confs
+++ b/regress/scripts/copy-migration-confs
@@ -6,3 +6,4 @@
 /bin/cp -f scripts/bacula-sd-migration.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
diff --git a/regress/scripts/copy-plugin-confs b/regress/scripts/copy-plugin-confs
index cc8bf3911e..81102c966a 100755
--- a/regress/scripts/copy-plugin-confs
+++ b/regress/scripts/copy-plugin-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 
 scripts/set_tape_options
diff --git a/regress/scripts/copy-strip-confs b/regress/scripts/copy-strip-confs
index 36b67f8b03..97cf1a4f89 100755
--- a/regress/scripts/copy-strip-confs
+++ b/regress/scripts/copy-strip-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 
 scripts/set_tape_options
diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs
index c6de726d04..7e04edd2a9 100755
--- a/regress/scripts/copy-tape-confs
+++ b/regress/scripts/copy-tape-confs
@@ -3,5 +3,6 @@
 /bin/cp -f ${rscripts}/bacula-sd-tape.conf ${scripts}/bacula-sd.conf
 /bin/cp -f ${rscripts}/test-bacula-fd.conf ${scripts}/bacula-fd.conf
 /bin/cp -f ${rscripts}/test-console.conf ${scripts}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${scripts}/bat.conf
 
 ${rscripts}/set_tape_options
diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs
index 32067113df..78d1a2ef43 100755
--- a/regress/scripts/copy-test-confs
+++ b/regress/scripts/copy-test-confs
@@ -1,7 +1,8 @@
 #!/bin/sh
-/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${conf}/bacula-dir.conf
-/bin/cp -f ${rscripts}/test-bacula-sd.conf ${conf}/bacula-sd.conf
-/bin/cp -f ${rscripts}/test-bacula-fd.conf ${conf}/bacula-fd.conf
-/bin/cp -f ${rscripts}/test-console.conf ${conf}/bconsole.conf
+/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${bin}/bacula-dir.conf
+/bin/cp -f ${rscripts}/test-bacula-sd.conf ${bin}/bacula-sd.conf
+/bin/cp -f ${rscripts}/test-bacula-fd.conf ${bin}/bacula-fd.conf
+/bin/cp -f ${rscripts}/test-console.conf ${bin}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${bin}/bat.conf
 
 ${rscripts}/set_tape_options
diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs
index b4e2f6b94c..8b42652778 100755
--- a/regress/scripts/copy-testa-confs
+++ b/regress/scripts/copy-testa-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 
 scripts/set_tape_options
diff --git a/regress/scripts/copy-tls-auth-conf b/regress/scripts/copy-tls-auth-conf
index dd9843286c..1a6d790498 100755
--- a/regress/scripts/copy-tls-auth-conf
+++ b/regress/scripts/copy-tls-auth-conf
@@ -4,5 +4,6 @@
 /bin/cp -f scripts/tls-auth-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/tls-auth-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 /bin/cp -f scripts/tls-CA.pem bin/tls-CA.pem
 /bin/cp -f scripts/tls-cert.pem bin/tls-cert.pem
diff --git a/regress/scripts/copy-tls-confs b/regress/scripts/copy-tls-confs
index af61e453cd..16129a8200 100755
--- a/regress/scripts/copy-tls-confs
+++ b/regress/scripts/copy-tls-confs
@@ -4,5 +4,6 @@
 /bin/cp -f scripts/tls-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/tls-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 /bin/cp -f scripts/tls-CA.pem bin/tls-CA.pem
 /bin/cp -f scripts/tls-cert.pem bin/tls-cert.pem
diff --git a/regress/scripts/copy-virtual-confs b/regress/scripts/copy-virtual-confs
index 3fd3e4868e..177ec5280e 100755
--- a/regress/scripts/copy-virtual-confs
+++ b/regress/scripts/copy-virtual-confs
@@ -6,3 +6,4 @@
 /bin/cp -f scripts/bacula-sd-virtual.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs
index e3cc5fd8fc..019c9cd3e7 100755
--- a/regress/scripts/copy-win32-confs
+++ b/regress/scripts/copy-win32-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/win32-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 
 scripts/set_tape_options
-- 
2.39.5