projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3524c46
)
Removed migrate_old_installs() from setup.c because the directories it removes are...
author
Art Cancro
<ajc@uncensored.citadel.org>
Fri, 20 Jan 2012 19:27:25 +0000
(14:27 -0500)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Fri, 20 Jan 2012 19:27:25 +0000
(14:27 -0500)
citadel/utils/setup.c
patch
|
blob
|
history
diff --git
a/citadel/utils/setup.c
b/citadel/utils/setup.c
index 311f1b28f52fff4b592c96414f0f91a5b018fc61..2644e2da9c2c8dac782c603c4188d3a9a02c9eef 100644
(file)
--- a/
citadel/utils/setup.c
+++ b/
citadel/utils/setup.c
@@
-1131,17
+1131,6
@@
int discover_ui(void)
-void migrate_old_installs(void)
-{
- int rv;
- rv = system("exec /bin/rm -fr ./rooms ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
- if (rv != 0)
- fprintf(stderr, _("failed to remove old style directories.\n"));
- unlink("citadel.log");
- unlink("weekly");
-}
-
-
/*
* Strip "db" entries out of /etc/nsswitch.conf
*/
/*
* Strip "db" entries out of /etc/nsswitch.conf
*/
@@
-1611,8
+1600,6
@@
NEW_INST:
write_config_to_disk();
write_config_to_disk();
- migrate_old_installs(); /* Delete files and directories used by older Citadel versions */
-
if ( ((setup_type == UI_SILENT)
&& (getenv("ALTER_ETC_SERVICES")!=NULL))
|| (setup_type != UI_SILENT)
if ( ((setup_type == UI_SILENT)
&& (getenv("ALTER_ETC_SERVICES")!=NULL))
|| (setup_type != UI_SILENT)