Skip to content

Commit 3902bb2

Browse files
author
David Kadlecek
committed
Added support for electron original-fs
1 parent eeb7633 commit 3902bb2

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

adm-zip.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var fs = require("fs"),
1+
var Utils = require("./util");
2+
var fs = Utils.FileSystem.require(),
23
pth = require("path");
34

45
fs.existsSync = fs.existsSync || pth.existsSync;
56

67
var ZipEntry = require("./zipEntry"),
7-
ZipFile = require("./zipFile"),
8-
Utils = require("./util");
8+
ZipFile = require("./zipFile");
99

1010
module.exports = function(/*String*/input) {
1111
var _zip = undefined,

util/fattr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var fs = require("fs"),
1+
var fs = require("./fileSystem").require(),
22
pth = require("path");
33

44
fs.existsSync = fs.existsSync || pth.existsSync;

util/fileSystem.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
exports.require = function() {
2+
return require(process.versions['electron'] ? "original-fs" : "fs");
3+
};

util/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = require("./utils");
2+
module.exports.FileSystem = require("./fileSystem");
23
module.exports.Constants = require("./constants");
34
module.exports.Errors = require("./errors");
45
module.exports.FileAttr = require("./fattr");

util/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var fs = require("fs"),
1+
var fs = require("./fileSystem").require(),
22
pth = require('path');
33

44
fs.existsSync = fs.existsSync || pth.existsSync;

zipFile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = function(/*String|Buffer*/input, /*Number*/inputType) {
77
entryTable = {},
88
_comment = new Buffer(0),
99
filename = "",
10-
fs = require("fs"),
10+
fs = Utils.FileSystem.require(),
1111
inBuffer = null,
1212
mainHeader = new Headers.MainHeader();
1313

0 commit comments

Comments
 (0)