RSS-Client: add missing locks

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

diff --git a/citadel/database_cleanup.sh.in b/citadel/database_cleanup.sh.in
index fa5c3cfaff6e9660e9479ba780e0510cb53e613e..dde4aec229a26484aa48ec5a383582349f774916 100755 (executable)
--- a/citadel/database_cleanup.sh.in
+++ b/citadel/database_cleanup.sh.in
@@ -30,13 +30,18 @@ else
                if test -n "`ls /usr/bin/db?*recover`"; then
                        # seems we have something debian alike thats adding version in the filename
                        if test "`ls /usr/bin/db*recover |wc -l`" -gt "1"; then 
-                               echo "Warning, you have more than one berkley db utility version installed. using the latest one." 1>&2
+                               echo "Warning: you have more than one version of the Berkeley DB utilities installed." 1>&2
+                               echo "Using the latest one." 1>&2
                                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 "We can't find the berkeley DB tools, exiting." 1>&2
+                       echo "database_cleanup.sh cannot find the Berkeley DB utilities.  Exiting." 1>&2
                        die
                fi
 
@@ -66,13 +71,14 @@ 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
   the size of your database, see the following output:
-  (for substantial better performance you should specify a location that's 
+  (for substantially better performance you should specify a location that is 
    on another disk than $DATA_DIR)
 
 `df -h`
@@ -94,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
@@ -105,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