Merge pull request electron#159 from Appuls/Appuls/bugfix/createPacka…

…geFromFiles-regression fix: Normalized filepaths in createPackageFromFiles
thiagorova · Oct 9, 2018 · c2d3d86 · c2d3d86
2 parents b32cb84 + b4eeb46
commit c2d3d86
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/lib/asar.js b/lib/asar.js
@@ -63,6 +63,11 @@ callback: The callback function. Accepts (err).
 module.exports.createPackageFromFiles = function (src, dest, filenames, metadata, options, callback) {
   if (typeof metadata === 'undefined' || metadata === null) { metadata = {} }
   if (typeof options === 'undefined' || options === null) { options = {} }
+
+  src = path.normalize(src)
+  dest = path.normalize(dest)
+  filenames = filenames.map(function (filename) { return path.normalize(filename) })
+
   const filesystem = new Filesystem(src)
   const files = []
   const unpackDirs = []

diff --git a/test/api-spec.js b/test/api-spec.js
@@ -20,6 +20,14 @@ describe('api', function () {
       done(compFiles('tmp/packthis-api.asar', 'test/expected/packthis.asar'))
     })
   })
+  if (os.platform() === 'win32') {
+    it('should create archive with windows-style path separators', function (done) {
+      asar.createPackage('test\\input\\packthis\\', 'tmp\\packthis-api.asar', function (error) {
+        if (error != null) return done(error)
+        done(compFiles('tmp/packthis-api.asar', 'test/expected/packthis.asar'))
+      })
+    })
+  }
   it('should create archive from directory (without hidden files)', function (done) {
     asar.createPackageWithOptions('test/input/packthis/', 'tmp/packthis-without-hidden-api.asar', {dot: false}, function (error) {
       if (error != null) return done(error)

diff --git a/test/cli-spec.js b/test/cli-spec.js
@@ -19,6 +19,14 @@ describe('command line interface', function () {
       done(compFiles('tmp/packthis-cli.asar', 'test/expected/packthis.asar'))
     })
   })
+  if (os.platform() === 'win32') {
+    it('should create archive from directory with windows-style path separators', function (done) {
+      exec('node bin/asar p test\\input\\packthis\\ tmp\\packthis-cli.asar', function (error, stdout, stderr) {
+        if (error != null) return done(error)
+        done(compFiles('tmp/packthis-cli.asar', 'test/expected/packthis.asar'))
+      })
+    })
+  }
   it('should create archive from directory without hidden files', function (done) {
     exec('node bin/asar p test/input/packthis/ tmp/packthis-without-hidden-cli.asar --exclude-hidden', function (error, stdout, stderr) {
       if (error != null) return done(error)