* Removed the "weekly" script and began installing a facility to allow

[citadel.git] / citadel / setup.c

diff --git a/citadel/setup.c b/citadel/setup.c
index 2113246c3b0e2d9a2dd5687e344382ce0d2cc69c..11dfd1054fd54474c148087dda497e135d213529 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -920,10 +920,11 @@ int main(int argc, char *argv[])
 
        old_setup_level = config.c_setup_level;
 
-       if (old_setup_level == 0)
+       if (old_setup_level == 0) {
                goto NEW_INST;
+       }
 
-       if (old_setup_level < 323) {
+       if (old_setup_level < 555) {
                important_message("Citadel/UX Setup",
                                  "This Citadel/UX installation is too old "
                                  "to be upgraded.");
@@ -931,17 +932,6 @@ int main(int argc, char *argv[])
        }
        write_config_to_disk();
 
-       if ((config.c_setup_level / 10) == 32) {
-               important_msgnum(31);
-               cleanup(0);
-       }
-       if (config.c_setup_level < 400) {
-               config.c_setup_level = 400;
-       }
-       /* end of 3.23 -> 4.00 update section */
-
-       /* end of 4.00 -> 4.02 update section */
-
        old_setup_level = config.c_setup_level;
 
        /* end of version update section */
@@ -961,11 +951,10 @@ NEW_INST:
        mkdir("images", 0700);
        mkdir("netconfigs", 0700);
 
-       /* Delete a bunch of old files from Citadel v4; don't need anymore */
+       /* Delete files and directories used by older Citadel versions */
        system("rm -fr ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
-
-       /* Delete the old citadel.log file; this facility has been removed */
        unlink("citadel.log");
+       unlink("weekly");
 
        check_services_entry(); /* Check /etc/services */
 #ifndef __CYGWIN__