Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / database_cleanup.sh.in

diff --git a/citadel/database_cleanup.sh.in b/citadel/database_cleanup.sh.in
index 6b786300696087729d267ef42952ee4829efbda1..dde4aec229a26484aa48ec5a383582349f774916 100755 (executable)
--- a/citadel/database_cleanup.sh.in
+++ b/citadel/database_cleanup.sh.in
@@ -35,6 +35,10 @@ else
                                RECOVER=`ls /usr/bin/db*recover |sort |tail -n 1`
                                DUMP=`ls /usr/bin/db*dump |sort |tail -n 1`
                                LOAD=`ls /usr/bin/db*load |sort |tail -n 1`
+                       else
+                               RECOVER=`ls /usr/bin/db*recover`
+                               DUMP=`ls /usr/bin/db*dump`
+                               LOAD=`ls /usr/bin/db*load`
                        fi
                else
                        echo "database_cleanup.sh cannot find the Berkeley DB utilities.  Exiting." 1>&2
@@ -67,8 +71,9 @@ WARNING #2:
   citserver must NOT be running while you do this.
 
 WARNING #3:
-  Please try "cd $DATA_DIR; $RECOVER -c" first.  Use this tool
-  only if that one fails to fix your problem.
+  Please try "cd $DATA_DIR; $RECOVER -c" first. Run citserver afterwards to 
+  revalidate whether its fixed or not, No news might be good news. Use this
+  tool only if that one fails to fix your problem.
 
 WARNING #4:
   You must have an amount of free space on your disk that is at least twice
@@ -95,7 +100,7 @@ case "$yesno" in
                exit
 esac
 
-for x in 00 01 02 03 04 05 06 07 08 09 0a
+for x in 00 01 02 03 04 05 06 07 08 09 0a 0b 0c
 do
        filename=cdb.$x
        echo Dumping $filename
@@ -106,7 +111,7 @@ done
 echo Removing old databases
 rm -f ./data/*
 
-for x in 00 01 02 03 04 05 06 07 08 09 0a
+for x in 00 01 02 03 04 05 06 07 08 09 0a 0b 0c
 do
        filename=cdb.$x
        echo Loading $filename