  rm -rf build bin
  # Copy new source
  echo "Copying source from ${BACULA_SOURCE}"
-Index: scripts/copy-virtual-confs
-===================================================================
---- scripts/copy-virtual-confs	(révision 7895)
-+++ scripts/copy-virtual-confs	(copie de travail)
-@@ -2,7 +2,7 @@
- #
- # Setup for using the Virtual Disk Changer (simulates tape changer)
- #
--/bin/cp -f scripts/bacula-dir-virtual.conf bin/bacula-dir.conf
--/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/bacula-dir-virtual.conf $bin/bacula-dir.conf
-+/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
-Index: scripts/copy-migration-confs
-===================================================================
---- scripts/copy-migration-confs	(révision 7895)
-+++ scripts/copy-migration-confs	(copie de travail)
-@@ -2,7 +2,7 @@
- #
- # Setup for using the Virtual Disk Changer (simulates tape changer)
- #
--/bin/cp -f scripts/bacula-dir-migration.conf bin/bacula-dir.conf
--/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/bacula-dir-migration.conf $bin/bacula-dir.conf
-+/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
-Index: scripts/copy-2drive-confs
-===================================================================
---- scripts/copy-2drive-confs	(révision 7895)
-+++ scripts/copy-2drive-confs	(copie de travail)
-@@ -1,11 +1,9 @@
- #!/bin/sh
--/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf
--/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/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
- 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
-+sed -f ${outf} scripts/bacula-dir-tape.conf > $bin/bacula-dir.conf
- 
- scripts/set_tape_options
-Index: scripts/copy-strip-confs
-===================================================================
---- scripts/copy-strip-confs	(révision 7895)
-+++ scripts/copy-strip-confs	(copie de travail)
-@@ -1,7 +1,7 @@
- #!/bin/sh
--/bin/cp -f scripts/bacula-dir-strip.conf bin/bacula-dir.conf
--/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/bacula-dir-strip.conf $bin/bacula-dir.conf
-+/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
- 
- scripts/set_tape_options
-Index: scripts/copy-test-confs
-===================================================================
---- scripts/copy-test-confs	(révision 7895)
-+++ scripts/copy-test-confs	(copie de travail)
-@@ -1,7 +1,7 @@
- #!/bin/sh
--/bin/cp -f scripts/new-test-bacula-dir.conf bin/bacula-dir.conf
--/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/new-test-bacula-dir.conf $bin/bacula-dir.conf
-+/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
- 
- scripts/set_tape_options
-Index: scripts/copy-2disk-drive-confs
-===================================================================
---- scripts/copy-2disk-drive-confs	(révision 7895)
-+++ scripts/copy-2disk-drive-confs	(copie de travail)
-@@ -1,10 +1,8 @@
- #!/bin/sh
--/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf
--/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/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
- 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
-+sed -f ${outf} scripts/bacula-dir-tape.conf > $bin/bacula-dir.conf
- 
-Index: scripts/copy-fifo-confs
-===================================================================
---- scripts/copy-fifo-confs	(révision 7895)
-+++ scripts/copy-fifo-confs	(copie de travail)
-@@ -1,7 +1,7 @@
- #!/bin/sh
--/bin/cp -f scripts/bacula-dir-fifo.conf bin/bacula-dir.conf
--/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/bacula-dir-fifo.conf $bin/bacula-dir.conf
-+/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
- 
- scripts/set_tape_options
-Index: scripts/copy-tape-confs
-===================================================================
---- scripts/copy-tape-confs	(révision 7895)
-+++ scripts/copy-tape-confs	(copie de travail)
-@@ -1,7 +1,7 @@
- #!/bin/sh
--/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf
--/bin/cp -f scripts/bacula-sd-tape.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/bacula-dir-tape.conf $bin/bacula-dir.conf
-+/bin/cp -f scripts/bacula-sd-tape.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
- 
- scripts/set_tape_options
 Index: scripts/cleanup-2drive.in
 ===================================================================
 --- scripts/cleanup-2drive.in	(révision 7895)

 mkdir -p ${cwd}/tmp/bacula-restores
 if test "$debug" -eq 1 ; then
-  bin/bextract -v -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores                
+  $bin/bextract -v -b working/restore.bsr -c $bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores                
 else
-  bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null
+  $bin/bextract -b working/restore.bsr -c $bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null
 fi
 rstat=$?
 grep "^  Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null
Index: tests/copy-volume-test
===================================================================
--- tests/copy-volume-test	(révision 7895)
+++ tests/copy-volume-test	(copie de travail)
@@ -14,12 +14,12 @@
 scripts/copy-migration-confs
 scripts/prepare-disk-changer
 echo "${cwd}/build" >${cwd}/tmp/file-list
-#cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-#sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+#cp $bin/bacula-sd.conf ${cwd}/tmp/1
+#sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >$bin/bacula-sd.conf
 
 change_jobname NightlySave $JobName
-sed 's/migrate/copy/g' ${cwd}/bin/bacula-dir.conf > ${cwd}/tmp/1
-sed 's/Migrate/Copy/g' ${cwd}/tmp/1 > ${cwd}/bin/bacula-dir.conf
+sed 's/migrate/copy/g' $bin/bacula-dir.conf > ${cwd}/tmp/1
+sed 's/Migrate/Copy/g' ${cwd}/tmp/1 > $bin/bacula-dir.conf
 rm -f ${cwd}/build/po/test.po >/dev/null
 
 start_test
Index: tests/four-jobs-tape
===================================================================
--- tests/four-jobs-tape	(révision 7895)

       ;;
    *)
       echo "Something went wrong. Expected $SLOT1 or $SLOT2, got $slot"
Index: scripts/check_for_zombie_jobs
===================================================================
--- scripts/check_for_zombie_jobs	(révision 7895)
