From df3c3951bcdb3b0a6d6676385b732d8c3ad8957b Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 3 May 2021 09:00:03 -0400 Subject: [PATCH] remove some cleanup code Signed-off-by: Sebastian Malton --- .../components/+extensions/extensions.tsx | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx index 258017477b..821627420e 100644 --- a/src/renderer/components/+extensions/extensions.tsx +++ b/src/renderer/components/+extensions/extensions.tsx @@ -166,22 +166,12 @@ async function validatePackage(filePath: string): Promise return manifest; } -async function createTempFilesAndValidate({ fileName, dataP }: InstallRequest, disposer: ExtendableDisposer): Promise { +async function createTempFilesAndValidate({ fileName, dataP }: InstallRequest): Promise { // copy files to temp await fse.ensureDir(getExtensionPackageTemp()); // validate packages const tempFile = getExtensionPackageTemp(fileName); - let id: string | undefined = undefined; - - disposer.push(() => { - // This is necessary so that this file is only removed on the error condition. - // if `id` is set then when the disposer is optionally called in `unpackExtension` - // this file will not be removed. - if (!id) { - fse.unlink(tempFile).catch(noop); - } - }); try { const data = await dataP; @@ -192,8 +182,7 @@ async function createTempFilesAndValidate({ fileName, dataP }: InstallRequest, d await fse.writeFile(tempFile, data); const manifest = await validatePackage(tempFile); - - id = path.join(extensionDiscovery.nodeModulesPath, manifest.name, "package.json"); + const id = path.join(extensionDiscovery.nodeModulesPath, manifest.name, "package.json"); return { fileName, @@ -326,7 +315,7 @@ export async function attemptInstallByInfo({ name, version, requireConfirmation async function attemptInstall(request: InstallRequest, d?: ExtendableDisposer): Promise { const dispose = disposer(ExtensionInstallationStateStore.startPreInstall(), d); - const validatedRequest = await createTempFilesAndValidate(request, dispose); + const validatedRequest = await createTempFilesAndValidate(request); if (!validatedRequest) { return dispose();