github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't let previous extraction attempts interfere with later ones.

Browse Source
This commit is contained in:
Ben Newman
2016-07-22 11:56:25 -04:00
parent ed624147d7
commit 136c2f8696
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/fs/files.js
View File

@@ -727,7 +727,15 @@ files.extractTarGz = function (buffer, destPath, options) {
files.rmdir(tempDir);
};
function ensureDirectoryEmpty(dir) {
files.readdir(dir).forEach(file => {
files.rm_recursive(files.pathJoin(dir, file));
});
}
function tryExtractWithNativeTar(buffer, tempDir) {
ensureDirectoryEmpty(tempDir);
const tarProc = spawn("tar", ["xzf", "-"], {
cwd: tempDir,
stdio: "pipe"
@@ -743,6 +751,8 @@ function tryExtractWithNativeTar(buffer, tempDir) {
}
function tryExtractWithNative7z(buffer, tempDir) {
ensureDirectoryEmpty(tempDir);
const exeOSPath = files.convertToOSPath(
files.pathJoin(files.getCurrentNodeBinDir(), "7z.exe"));
const tarGzBasename = "out.tar.gz";
@@ -796,6 +806,8 @@ function tryExtractWithNative7z(buffer, tempDir) {
}
function tryExtractWithNpmTar(buffer, tempDir) {
ensureDirectoryEmpty(tempDir);
var tar = require("tar");
var zlib = require("zlib");