From d6177a64f2f33a229e53b3861cb7e9dfd798bb86 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 17 Feb 2021 10:17:39 -0500 Subject: [PATCH] more work Signed-off-by: Sebastian Malton --- package.json | 2 +- src/common/utils/tar.ts | 4 ++-- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e575e48520..1380946d19 100644 --- a/package.json +++ b/package.json @@ -229,7 +229,7 @@ "serializr": "^2.0.3", "shell-env": "^3.0.1", "spdy": "^4.0.2", - "tar": "^6.0.5", + "tar": "^6.1.0", "tcp-port-used": "^1.0.1", "tempy": "^0.5.0", "uuid": "^8.3.2", diff --git a/src/common/utils/tar.ts b/src/common/utils/tar.ts index 659210e682..631aec7811 100644 --- a/src/common/utils/tar.ts +++ b/src/common/utils/tar.ts @@ -18,10 +18,10 @@ export function passBuffer(buf: Buffer): Buffer { } export function readFileFromTar({ tarPath, filePath, parse }: ReadFileFromTarOpts): Promise { - return new Promise((resolve, reject) => { + return new Promise(async (resolve, reject) => { const fileChunks: Buffer[] = []; - tar.list({ + await tar.list({ file: tarPath, filter: entryPath => path.normalize(entryPath) === filePath, onentry(entry: FileStat) { diff --git a/yarn.lock b/yarn.lock index 2cc97b2383..0757853436 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13052,10 +13052,10 @@ tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" - integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== +tar@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" + integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0"