Skip to content
This repository has been archived by the owner on Nov 4, 2018. It is now read-only.

Commit

Permalink
* s3cmd, s3cmd.1, format-manpage.pl: Improved --help text
Browse files Browse the repository at this point in the history 
	  and manpage.
	* s3cmd: Removed explicit processing of --follow-symlinks
	  (is cought by the default / main loop).



git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@462 830e0280-6d2a-0410-9c65-932aecc39d9d
  • Loading branch information
@mludvig
mludvig committed Jan 2, 2011
1 parent 0222ce4 commit da0fb7b
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 14 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,10 @@
2011-01-02 Michal Ludvig <mludvig@logix.net.nz>

* s3cmd, s3cmd.1, format-manpage.pl: Improved --help text
and manpage.
* s3cmd: Removed explicit processing of --follow-symlinks
(is cought by the default / main loop).

2010-12-24 Michal Ludvig <mludvig@logix.net.nz> 2010-12-24 Michal Ludvig <mludvig@logix.net.nz>


* s3cmd: Set 10s socket timeout for read()/write(). * s3cmd: Set 10s socket timeout for read()/write().
Expand Down
10 changes: 6 additions & 4 deletions format-manpage.pl
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -159,25 +159,27 @@
For example to exclude all files with \".jpg\" extension except those beginning with a number use: For example to exclude all files with \".jpg\" extension except those beginning with a number use:
.PP .PP
\\-\\-exclude '*.jpg' \\-\\-rinclude '[0-9].*\\.jpg' \\-\\-exclude '*.jpg' \\-\\-rinclude '[0-9].*\\.jpg'
.SH SEE ALSO .SH SEE ALSO
For the most up to date list of options run For the most up to date list of options run
.B s3cmd \\-\\-help .B s3cmd \\-\\-help
.br .br
For more info about usage, examples and other related info visit project homepage at For more info about usage, examples and other related info visit project homepage at
.br .br
.B http://s3tools.org .B http://s3tools.org
.SH DONATIONS
Please consider a donation if you have found s3cmd useful:
.br
.B http://s3tools.org/donate
.SH AUTHOR .SH AUTHOR
Written by Michal Ludvig <mludvig\@logix.net.nz> Written by Michal Ludvig <mludvig\@logix.net.nz> and 15+ contributors
.SH CONTACT, SUPPORT .SH CONTACT, SUPPORT
Prefered way to get support is our mailing list: Prefered way to get support is our mailing list:
.I s3tools\\-general\@lists.sourceforge.net .I s3tools\\-general\@lists.sourceforge.net
.SH REPORTING BUGS .SH REPORTING BUGS
Report bugs to Report bugs to
.I s3tools\\-bugs\@lists.sourceforge.net .I s3tools\\-bugs\@lists.sourceforge.net
.SH COPYRIGHT .SH COPYRIGHT
Copyright \\(co 2007,2008,2009,2010 Michal Ludvig <http://www.logix.cz/michal> Copyright \\(co 2007,2008,2009,2010,2011 Michal Ludvig <http://www.logix.cz/michal>
.br .br
This is free software. You may redistribute copies of it under the terms of This is free software. You may redistribute copies of it under the terms of
the GNU General Public License version 2 <http://www.gnu.org/licenses/gpl.html>. the GNU General Public License version 2 <http://www.gnu.org/licenses/gpl.html>.
Expand Down
8 changes: 3 additions & 5 deletions s3cmd
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1716,7 +1716,7 @@ def main():
optparser.add_option( "--skip-existing", dest="skip_existing", action="store_true", help="Skip over files that exist at the destination (only for [get] and [sync] commands).") optparser.add_option( "--skip-existing", dest="skip_existing", action="store_true", help="Skip over files that exist at the destination (only for [get] and [sync] commands).")
optparser.add_option("-r", "--recursive", dest="recursive", action="store_true", help="Recursive upload, download or removal.") optparser.add_option("-r", "--recursive", dest="recursive", action="store_true", help="Recursive upload, download or removal.")
optparser.add_option( "--check-md5", dest="check_md5", action="store_true", help="Check MD5 sums when comparing files for [sync]. (default)") optparser.add_option( "--check-md5", dest="check_md5", action="store_true", help="Check MD5 sums when comparing files for [sync]. (default)")
optparser.add_option( "--no-check-md5", dest="check_md5", action="store_false", help="Do not check MD5 sums when comparing files for [sync]. Only size be compared. May significantly speed up transfer but may also miss some changed files.") optparser.add_option( "--no-check-md5", dest="check_md5", action="store_false", help="Do not check MD5 sums when comparing files for [sync]. Only size will be compared. May significantly speed up transfer but may also miss some changed files.")
optparser.add_option("-P", "--acl-public", dest="acl_public", action="store_true", help="Store objects with ACL allowing read for anyone.") optparser.add_option("-P", "--acl-public", dest="acl_public", action="store_true", help="Store objects with ACL allowing read for anyone.")
optparser.add_option( "--acl-private", dest="acl_public", action="store_false", help="Store objects with default ACL allowing access for you only.") optparser.add_option( "--acl-private", dest="acl_public", action="store_false", help="Store objects with default ACL allowing access for you only.")
optparser.add_option( "--acl-grant", dest="acl_grants", type="s3acl", action="append", metavar="PERMISSION:EMAIL or USER_CANONICAL_ID", help="Grant stated permission to a given amazon user. Permission is one of: read, write, read_acp, write_acp, full_control, all") optparser.add_option( "--acl-grant", dest="acl_grants", type="s3acl", action="append", metavar="PERMISSION:EMAIL or USER_CANONICAL_ID", help="Grant stated permission to a given amazon user. Permission is one of: read, write, read_acp, write_acp, full_control, all")
Expand Down Expand Up @@ -1771,7 +1771,8 @@ def main():
'"buckets" and uploading, downloading and removing '+ '"buckets" and uploading, downloading and removing '+
'"objects" from these buckets.') '"objects" from these buckets.')
optparser.epilog = format_commands(optparser.get_prog_name(), commands_list) optparser.epilog = format_commands(optparser.get_prog_name(), commands_list)
optparser.epilog += ("\nSee program homepage for more information at\n%s\n" % PkgInfo.url) optparser.epilog += ("\nFor more informations see the progect homepage:\n%s\n" % PkgInfo.url)
optparser.epilog += ("\nConsider a donation if you have found s3cmd useful:\n%s/donate\n" % PkgInfo.url)


(options, args) = optparser.parse_args() (options, args) = optparser.parse_args()


Expand Down Expand Up @@ -1907,9 +1908,6 @@ def main():
cfg.include.extend(patterns_list) cfg.include.extend(patterns_list)
cfg.debug_include.update(patterns_textual) cfg.debug_include.update(patterns_textual)


## Process --follow-symlinks
cfg.update_option("follow_symlinks", options.follow_symlinks)

## Set socket read()/write() timeout ## Set socket read()/write() timeout
socket.setdefaulttimeout(cfg.socket_timeout) socket.setdefaulttimeout(cfg.socket_timeout)


Expand Down
21 changes: 16 additions & 5 deletions s3cmd.1
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -134,6 +134,15 @@ for [get] and [sync] commands).
\fB\-r\fR, \fB\-\-recursive\fR \fB\-r\fR, \fB\-\-recursive\fR
Recursive upload, download or removal. Recursive upload, download or removal.
.TP .TP
\fB\-\-check\-md5\fR
Check MD5 sums when comparing files for [sync].
(default)
.TP
\fB\-\-no\-check\-md5\fR
Do not check MD5 sums when comparing files for [sync].
Only size will be compared. May significantly speed up
transfer but may also miss some changed files.
.TP
\fB\-P\fR, \fB\-\-acl\-public\fR \fB\-P\fR, \fB\-\-acl\-public\fR
Store objects with ACL allowing read for anyone. Store objects with ACL allowing read for anyone.
.TP .TP
Expand Down Expand Up @@ -282,7 +291,7 @@ Enable verbose output.
Enable debug output. Enable debug output.
.TP .TP
\fB\-\-version\fR \fB\-\-version\fR
Show s3cmd version (1.0.0-rc2) and exit. Show s3cmd version (1.0.0) and exit.
.TP .TP
\fB\-F\fR, \fB\-\-follow\-symlinks\fR \fB\-F\fR, \fB\-\-follow\-symlinks\fR
Follow symbolic links as if they are regular files Follow symbolic links as if they are regular files
Expand Down Expand Up @@ -363,25 +372,27 @@ about matching file names against exclude and include rules.
For example to exclude all files with ".jpg" extension except those beginning with a number use: For example to exclude all files with ".jpg" extension except those beginning with a number use:
.PP .PP
\-\-exclude '*.jpg' \-\-rinclude '[0-9].*\.jpg' \-\-exclude '*.jpg' \-\-rinclude '[0-9].*\.jpg'

.SH SEE ALSO .SH SEE ALSO
For the most up to date list of options run For the most up to date list of options run
.B s3cmd \-\-help .B s3cmd \-\-help
.br .br
For more info about usage, examples and other related info visit project homepage at For more info about usage, examples and other related info visit project homepage at
.br .br
.B http://s3tools.org .B http://s3tools.org

.SH DONATIONS
Please consider a donation if you have found s3cmd useful:
.br
.B http://s3tools.org/donate
.SH AUTHOR .SH AUTHOR
Written by Michal Ludvig <mludvig@logix.net.nz> Written by Michal Ludvig <mludvig@logix.net.nz> and 15+ contributors
.SH CONTACT, SUPPORT .SH CONTACT, SUPPORT
Prefered way to get support is our mailing list: Prefered way to get support is our mailing list:
.I s3tools\-general@lists.sourceforge.net .I s3tools\-general@lists.sourceforge.net
.SH REPORTING BUGS .SH REPORTING BUGS
Report bugs to Report bugs to
.I s3tools\-bugs@lists.sourceforge.net .I s3tools\-bugs@lists.sourceforge.net
.SH COPYRIGHT .SH COPYRIGHT
Copyright \(co 2007,2008,2009,2010 Michal Ludvig <http://www.logix.cz/michal> Copyright \(co 2007,2008,2009,2010,2011 Michal Ludvig <http://www.logix.cz/michal>
.br .br
This is free software. You may redistribute copies of it under the terms of This is free software. You may redistribute copies of it under the terms of
the GNU General Public License version 2 <http://www.gnu.org/licenses/gpl.html>. the GNU General Public License version 2 <http://www.gnu.org/licenses/gpl.html>.
Expand Down

0 comments on commit da0fb7b

Please sign in to comment.