ebl update with $bin variable

[bacula/bacula] / regress / scripts / cleanup

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index 2b8ba91a81b9aeef23bbc34a55920d760bcd382b..e301244bb18c776b8e6270439c83f22068ad764c 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -2,6 +2,24 @@
 #
 # Cleanup left over files -- both before and after test run
 #
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small*
-rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume*
-rm -rf tmp/restored tmp/largefile
+cwd=`pwd`
+rm -rf ${cwd}/tmp/FileVolume*
+rm -rf ${cwd}/tmp/TestVolume001 ${cwd}/tmp/bacula-restores ${cwd}/tmp/Small*
+rm -rf ${cwd}/tmp/sed_tmp ${cwd}/tmp/file-list
+rm -rf tmp/*
+rm -rf working/log tmp/TEST-*
+rm -rf working/*.bsr
+rm -rf ${cwd}/tmp/disk-changer
+find . -name "gigaslam.gif" -exec rm -f {} \;
+
+
+# bin directory does not always exist
+if [ -d bin ]
+then
+  bin/bacula stop 2>&1 >/dev/null
+  cd bin
+  ./drop_bacula_tables      >/dev/null 2>&1
+  ./make_bacula_tables      >/dev/null 2>&1
+  ./grant_bacula_privileges >/dev/null 2>&1
+  cd ..
+fi