From 03a1da9d469be92a0ec34c8673293811694b8449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Mon, 25 Jan 2021 19:12:54 +0200
Subject: Simplify file download code

---
 editors/code/src/main.ts | 2 --
 editors/code/src/net.ts  | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'editors')

diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 1edb7713d..1900d900a 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -208,7 +208,6 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
             url: artifact.browser_download_url,
             dest,
             progressTitle: "Downloading rust-analyzer extension",
-            overwrite: true,
         });
     });
 
@@ -340,7 +339,6 @@ async function getServer(config: Config, state: PersistentState): Promise<string
             progressTitle: "Downloading rust-analyzer server",
             gunzip: true,
             mode: 0o755,
-            overwrite: true,
         });
     });
 
diff --git a/editors/code/src/net.ts b/editors/code/src/net.ts
index 3e50d352c..d39dc1baf 100644
--- a/editors/code/src/net.ts
+++ b/editors/code/src/net.ts
@@ -73,23 +73,16 @@ interface DownloadOpts {
     dest: string;
     mode?: number;
     gunzip?: boolean;
-    overwrite?: boolean;
 }
 
 export async function download(opts: DownloadOpts) {
     // Put artifact into a temporary file (in the same dir for simplicity)
     // to prevent partially downloaded files when user kills vscode
+    // This also avoids overwriting running executables
     const dest = path.parse(opts.dest);
     const randomHex = crypto.randomBytes(5).toString("hex");
     const tempFile = path.join(dest.dir, `${dest.name}${randomHex}`);
 
-    if (opts.overwrite) {
-        // Unlinking the exe file before moving new one on its place should prevent ETXTBSY error.
-        await fs.promises.unlink(opts.dest).catch(err => {
-            if (err.code !== "ENOENT") throw err;
-        });
-    }
-
     await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
-- 
cgit v1.2.3