Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Released version 1.1.0-beta2

* S3/PkgInfo.py: Updated to 1.1.0-beta2
* NEWS: Updated.
* s3cmd.1: Regenerated.
  • Loading branch information...
commit 6063e01c9fe8fbe4b9c6d6437d1a44b5031ee0de 1 parent d9c7251
Michal Ludvig mludvig authored

Showing 3 changed files with 29 additions and 13 deletions. Show diff stats Hide diff stats

  1. +2 0  NEWS
  2. +1 1  S3/PkgInfo.py
  3. +26 12 s3cmd.1
2  NEWS
@@ -8,6 +8,8 @@ s3cmd 1.1.0 - ???
8 8 is now on by default, -M is no longer shorthand for --guess-mime-type
9 9 * Allow parameters in MIME types, for example:
10 10 --mime-type="text/plain; charset=utf-8"
  11 +* MIME type can be guessed by python-magic which is a lot better than
  12 + relying on the extension. Contributed by Karsten Sperling.
11 13 * Support for environment variables as config values. For instance
12 14 in ~/.s3cmd put "access_key=$S3_ACCESS_KEY". Contributed by Ori Bar.
13 15 * Support for --configure checking access to a specific bucket instead
2  S3/PkgInfo.py
... ... @@ -1,5 +1,5 @@
1 1 package = "s3cmd"
2   -version = "1.1.0-beta1"
  2 +version = "1.1.0-beta2"
3 3 url = "http://s3tools.org"
4 4 license = "GPL version 2"
5 5 short_description = "Command line tool for managing Amazon S3 and CloudFront services"
38 s3cmd.1
@@ -65,6 +65,10 @@ Sign arbitrary string using the secret key
65 65 .TP
66 66 s3cmd \fBfixbucket\fR \fIs3://BUCKET[/PREFIX]\fR
67 67 Fix invalid file names in a bucket
  68 +
  69 +
  70 +.PP
  71 +Commands for static WebSites configuration
68 72 .TP
69 73 s3cmd \fBws-create\fR \fIs3://BUCKET\fR
70 74 Create Website from bucket
@@ -112,7 +116,7 @@ show this help message and exit
112 116 .TP
113 117 \fB\-\-configure\fR
114 118 Invoke interactive (re)configuration tool. Optionally
115   -use as '--configure s3://come-bucket' to test access
  119 +use as '\fB--configure\fR s3://come-bucket' to test access
116 120 to a specific bucket instead of attempting to list
117 121 them all.
118 122 .TP
@@ -206,8 +210,7 @@ Read --rexclude REGEXPs from FILE
206 210 \fB\-\-include\fR=GLOB
207 211 Filenames and paths matching GLOB will be included
208 212 even if previously excluded by one of
209   -.TP
210   -\fB\-\-(r)exclude(\-from)\fR patterns
  213 +\fB--(r)exclude(-from)\fR patterns
211 214 .TP
212 215 \fB\-\-include\-from\fR=FILE
213 216 Read --include GLOBs from FILE
@@ -240,19 +243,18 @@ commands)
240 243 Default MIME-type for stored objects. Application
241 244 default is binary/octet-stream.
242 245 .TP
243   -\fB\-M\fR, \fB\-\-guess\-mime\-type\fR
244   -Guess MIME-type of files by their extension. Fall back
245   -to default MIME-Type as specified by --default-mime-
246   -type option
  246 +\fB\-\-guess\-mime\-type\fR
  247 +Guess MIME-type of files by their extension or mime
  248 +magic. Fall back to default MIME-Type as specified by
  249 +\fB--default-mime-type\fR option
247 250 .TP
248 251 \fB\-\-no\-guess\-mime\-type\fR
249 252 Don't guess MIME-type and use the default type
250 253 instead.
251 254 .TP
252 255 \fB\-m\fR MIME/TYPE, \fB\-\-mime\-type\fR=MIME/TYPE
253   -Force MIME-type. Override both --default-mime-type and
254   -.TP
255   -\fB\-\-guess\-mime\-type.\fR
  256 +Force MIME-type. Override both \fB--default-mime-type\fR and
  257 +\fB--guess-mime-type\fR.
256 258 .TP
257 259 \fB\-\-add\-header\fR=NAME:VALUE
258 260 Add a given HTTP header to the upload request. Can be
@@ -268,6 +270,18 @@ Override autodetected terminal and filesystem encoding
268 270 Use the S3 name as given on the command line. No pre-
269 271 processing, encoding, etc. Use with caution!
270 272 .TP
  273 +\fB\-\-disable\-multipart\fR
  274 +Disable multipart upload on files bigger than
  275 +\fB--multipart-chunk-size-mb\fR
  276 +.TP
  277 +\fB\-\-multipart\-chunk\-size\-mb\fR=SIZE
  278 +Size of each chunk of a multipart upload. Files bigger
  279 +than SIZE are automatically uploaded as multithreaded-
  280 +multipart, smaller files are uploaded using the
  281 +traditional method. SIZE is in Mega-Bytes, default
  282 +chunk size is noneMB, minimum allowed chunk size is
  283 +5MB, maximum is 5GB.
  284 +.TP
271 285 \fB\-\-list\-md5\fR
272 286 Include MD5 sums in bucket listings (only for 'ls'
273 287 command).
@@ -326,7 +340,7 @@ Enable verbose output.
326 340 Enable debug output.
327 341 .TP
328 342 \fB\-\-version\fR
329   -Show s3cmd version (1.1.0-beta1) and exit.
  343 +Show s3cmd version (1.1.0-beta2) and exit.
330 344 .TP
331 345 \fB\-F\fR, \fB\-\-follow\-symlinks\fR
332 346 Follow symbolic links as if they are regular files
@@ -427,7 +441,7 @@ Prefered way to get support is our mailing list:
427 441 Report bugs to
428 442 .I s3tools\-bugs@lists.sourceforge.net
429 443 .SH COPYRIGHT
430   -Copyright \(co 2007,2008,2009,2010,2011 Michal Ludvig <http://www.logix.cz/michal>
  444 +Copyright \(co 2007,2008,2009,2010,2011,2012 Michal Ludvig <http://www.logix.cz/michal>
431 445 .br
432 446 This is free software. You may redistribute copies of it under the terms of
433 447 the GNU General Public License version 2 <http://www.gnu.org/licenses/gpl.html>.

0 comments on commit 6063e01

Please sign in to comment.
Something went wrong with that request. Please try again.