Merge with master

beatgammit · Aug 1, 2011 · f6cc4e2 · f6cc4e2
2 parents 56aeaf7 + 4763e4c
commit f6cc4e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/examples/index.html b/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);

diff --git a/lib/tar.js b/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) {

diff --git a/package.json b/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",