Fix path separator replacement for ignore on Windows

This needs to be done when Windows is the host OS regardless of the target platform, not vice versa. Fixes #79.
kfranqueiro · Jun 23, 2015 · 63db115 · 63db115
1 parent 178b3d4
commit 63db115
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common.js b/common.js
@@ -27,9 +27,9 @@ module.exports = {
     }
   },
 
-  userIgnoreFilter: function userIgnoreFilter (opts, is_win32, finalDir) {
+  userIgnoreFilter: function userIgnoreFilter (opts, finalDir) {
     return function filter (file) {
-      if (is_win32) {
+      if (path.sep === '\\') {
         // convert slashes so unix-format ignores work
         file = file.replace(/\\/g, '/')
       }

diff --git a/linux.js b/linux.js
@@ -26,7 +26,7 @@ module.exports = {
     }
 
     function copyUserApp () {
-      ncp(opts.dir, userAppDir, {filter: common.userIgnoreFilter(opts, false, finalDir), dereference: true}, function copied (err) {
+      ncp(opts.dir, userAppDir, {filter: common.userIgnoreFilter(opts, finalDir), dereference: true}, function copied (err) {
         if (err) return cb(err)
         common.prune(opts, userAppDir, cb, renameElectronBinary)
       })

diff --git a/win32.js b/win32.js
@@ -50,7 +50,7 @@ function buildWinApp (opts, cb, newApp) {
   }
 
   // copy users app into destination path
-  ncp(opts.dir, paths.app, {filter: common.userIgnoreFilter(opts, true), dereference: true}, function copied (err) {
+  ncp(opts.dir, paths.app, {filter: common.userIgnoreFilter(opts), dereference: true}, function copied (err) {
     if (err) return cb(err)
 
     function moveApp () {