Browse files

Merge with master

  • Loading branch information...
2 parents 56aeaf7 + 4763e4c commit f6cc4e2b9ccf7e9af76ca2f877c26962e154c4b4 @beatgammit committed Jul 31, 2011
Showing with 6 additions and 5 deletions.
  1. +2 −1 examples/index.html
  2. +3 −3 lib/tar.js
  3. +1 −1 package.json
View
3 examples/index.html
@@ -38,8 +38,9 @@
var contents = uint8ToString(data);
console.log(header.fileName, contents);
});
+
/*
- base64 = utils.uint8ToBase64(out);
+ base64 = btoa(uint8ToString(out));
url = "data:application/tar;base64," + base64;
window.open(url);
View
6 lib/tar.js
@@ -56,8 +56,8 @@
checksum: ' ',
type: '0', // just a file
ustar: 'ustar ',
- owner: '',
- group: ''
+ owner: opts.owner || '',
+ group: opts.group || ''
};
// calculate the checksum
@@ -88,7 +88,7 @@
this.out.set(input, this.written);
// to the nearest multiple of recordSize
- this.written += input.length + (recordSize - (input.length % recordSize));
+ this.written += input.length + (recordSize - (input.length % recordSize || recordSize));
// make sure there's at least 2 empty records worth of extra space
if (this.out.length - this.written < recordSize * 2) {
View
2 package.json
@@ -1,7 +1,7 @@
{
"name": "tar-js",
"description": "Tar implemented in the browser",
- "version": "0.1.0",
+ "version": "0.1.1",
"homepage": "http://github.com/beatgammit/tar-js",
"repository": {
"type": "git",

0 comments on commit f6cc4e2

Please sign in to comment.