merge of '432bfd0df53df4464e70c8b82989b3fcc7aa849e'

and '8e1a3af5628f31703023508d2fb742a933691c15'

Monotone-Parent: 432bfd0df53df4464e70c8b82989b3fcc7aa849e
Monotone-Parent: 8e1a3af5628f31703023508d2fb742a933691c15
Monotone-Revision: 77c7a08939b557080f47653bfa1203e557eb14d2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-23T15:06:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-06-23 15:06:22 +00:00
commit d1e2c5e1bf
3 changed files with 14 additions and 7 deletions

View file

@ -1,6 +1,6 @@
/* SOGoToolBackup.m - this file is part of SOGo
*
* Copyright (C) 2009 Inverse inc.
* Copyright (C) 2009-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@ -91,8 +91,9 @@
- (void) usage
{
fprintf (stderr, "backup directory ALL|user1 [user2] ...\n\n"
" folder the folder where backup files will be stored\n"
" user the user of whom to save the data\n");
" directory the target directory where backup files will be stored\n"
" user the user of whom to save the data or ALL for everybody\n\n"
"Example: sogo-tool backup /tmp/foo ALL\n");
}
- (BOOL) checkDirectory

View file

@ -1,6 +1,6 @@
/* SOGoToolRestore.m - this file is part of SOGo
*
* Copyright (C) 2009 Inverse inc.
* Copyright (C) 2009-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@ -104,9 +104,15 @@ typedef enum SOGoToolRestoreMode {
- (void) usage
{
fprintf (stderr, "restore [-l|-f/-F folder/ALL|-p] directory user\n\n"
" folder the folder where backup files will be stored\n"
" user the user of whom to save the data\n");
fprintf (stderr, "restore [-l|-p|-f/-F folder/ALL|-p] directory user\n\n"
" directory the directory where backup files were initially stored\n"
" user the user of whom to restore the data\n"
" -l flag used to list folders to restore\n"
" -p flag used to restore only the user's preferences\n"
" -f/-F flag used to specify which folder to restore, ALL for everything\n\n"
"Examples: sogo-tool restore -l /tmp/foo bob\n"
" sogo-tool restore -f Contacts/personal /tmp/foo bob\n"
" sogo-tool restore -p /tmp/foo bob\n");
}
- (BOOL) checkDirectory