@@ -20,14 +20,20 @@ "use strict"; | ||
if (!exists) { | ||
fsPath.mkdir(path.dirname(dist), function (err) { | ||
if (err) { | ||
callback && callback(err); | ||
} else { | ||
fs.mkdir(dist, function (err) { | ||
if (err && err.code === 'EEXIST') { | ||
err = null; | ||
} | ||
if (that._win32) { | ||
fsPath.mkdir(path.dirname(dist), function (err) { | ||
if (err) { | ||
callback && callback(err); | ||
}); | ||
} | ||
}); | ||
} else { | ||
fs.mkdir(dist, function (err) { | ||
if (err.code === 'EEXIST') { | ||
err = null; | ||
} | ||
callback && callback(err); | ||
}); | ||
} | ||
}); | ||
} else { | ||
child_process.exec('mkdir -p ' + dist.replace(/ /g, '\\ '), function (error, stdout, stderr) { | ||
callback && callback(error); | ||
}); | ||
} | ||
} else { | ||
@@ -58,7 +64,7 @@ callback && callback(null); | ||
} else { | ||
cmd = 'echo fa|xcopy /s /e "' + from + '" "' + dist + '"'; | ||
cmd = 'echo fa|xcopy "' + from + '" "' + dist + '"'; | ||
} | ||
} else { | ||
// linux or mac | ||
cmd = 'cp -r "' + from + '" "' + dist + '"'; | ||
cmd = 'cp -r ' + from.replace(/ /g, '\\ ') + ' ' + dist.replace(/ /g, '\\ '); | ||
} | ||
@@ -80,7 +86,7 @@ child_process.exec(cmd, function (error, stdout, stderr) { | ||
} else { | ||
cmd = 'echo fa|xcopy /s /e "' + from + '" "' + dist + '"'; | ||
cmd = 'echo fa|xcopy "' + from + '" "' + dist + '"'; | ||
} | ||
} else { | ||
// linux or mac | ||
cmd = 'cp -r "' + from + '" "' + dist + '"'; | ||
cmd = 'cp -r ' + from.replace(/ /g, '\\ ') + ' ' + dist.replace(/ /g, '\\ '); | ||
} | ||
@@ -198,3 +204,3 @@ this._supportExecSync(); | ||
callback = encoding; | ||
encoding = null; | ||
encoding = 'utf-8'; | ||
} | ||
@@ -201,0 +207,0 @@ fsPath.mkdir(path.dirname(dist), function (err) { |
{ | ||
"name": "fs-path", | ||
"version": "0.0.15", | ||
"version": "0.0.16", | ||
"main": "lib/index.js", | ||
@@ -27,22 +27,3 @@ "author": { | ||
"description": "file and directory op libs, find, findSync, mkdir, mkdirSync, copy, copySync, remove, removeSync, writeFile, writeFileSync", | ||
"_id": "fs-path@0.0.14", | ||
"scripts": {}, | ||
"_shasum": "dfcd8e72230ef5de2a8cccf58c25d032616141ba", | ||
"_from": "fs-path@0.0.14", | ||
"_npmVersion": "2.5.1", | ||
"_nodeVersion": "0.12.0", | ||
"_npmUser": { | ||
"name": "pillys", | ||
"email": "chenbl@liepin.com" | ||
}, | ||
"maintainers": [{ | ||
"name": "pillys", | ||
"email": "chenbl@liepin.com" | ||
}], | ||
"dist": { | ||
"shasum": "dfcd8e72230ef5de2a8cccf58c25d032616141ba", | ||
"tarball": "http://registry.npmjs.org/fs-path/-/fs-path-0.0.14.tgz" | ||
}, | ||
"directories": {}, | ||
"_resolved": "https://registry.npmjs.org/fs-path/-/fs-path-0.0.14.tgz" | ||
"readmeFilename": "README.md" | ||
} |
223
2.76%10620
-2.35%