X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fctdlmigrate.c;h=c3646c3e41614c45e64b752e5e7bf843ea9ab81e;hb=cdb873062246d255bb3813d4443bcaa0992e03ff;hp=18b10f511bcc50b1898e3471afcf0b513394870b;hpb=79bddf1aaf7c65188a812102bd91c6158ce3f0a4;p=citadel.git

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 18b10f511..c3646c3e4 100644
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 		"to a new host system via a network connection, without disturbing\n"
 		"the source system.  The target may be a different CPU architecture\n"
 		"and/or operating system.  The source system should be running\n"
-		"Citadel %d.%02d or newer, and the target system should be running\n"
+		"Citadel version %d or newer, and the target system should be running\n"
 		"either the same version or a newer version.  You will also need\n"
 		"the 'rsync' utility, and OpenSSH v4 or newer.\n"
 		"\n"
@@ -111,8 +111,7 @@ int main(int argc, char *argv[])
 		"\n"
 		"Do you wish to continue? "
 		,
-		EXPORT_REV_MIN / 100,
-		EXPORT_REV_MIN % 100
+		EXPORT_REV_MIN
 	);
 
 	if ((fgets(yesno, sizeof yesno, stdin) == NULL) || (tolower(yesno[0]) != 'y')) {
@@ -248,18 +247,10 @@ FAIL:	if (sourcefp) pclose(sourcefp);
 	while ((fgets(buf, sizeof buf, sourcefp)) && (strcmp(buf, "000"))) {
 		buf[strlen(buf)-1] = 0;
 
-		if (!strncasecmp(buf, "bio|", 4)) {
-			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-				socket_path, remote_user, remote_host, &buf[4], ctdl_bio_dir);
-		}
-		else if (!strncasecmp(buf, "files|", 6)) {
+		if (!strncasecmp(buf, "files|", 6)) {
 			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
 				socket_path, remote_user, remote_host, &buf[6], ctdl_file_dir);
 		}
-		else if (!strncasecmp(buf, "userpics|", 9)) {
-			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-				socket_path, remote_user, remote_host, &buf[9], ctdl_usrpic_dir);
-		}
 		else if (!strncasecmp(buf, "messages|", 9)) {
 			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
 				socket_path, remote_user, remote_host, &buf[9], ctdl_message_dir);