diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-11 21:35:49 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-11 21:35:49 +0000 |
commit | af5042bd61877383398c17d941cf4f93f1c2d6be (patch) | |
tree | 7916ac708663d233be235b3f17d134a1f410a1a4 /editors/code | |
parent | 6f685df68164aaf261ebd30a7bb8c81be96c8c77 (diff) | |
parent | b834b376826a6ff9a24d88894a91b810460960ec (diff) |
Merge #3115
3115: vscode: remove chmod in favour of an option to createWriteStream() r=matklad a=Veetaha
Inspired by [cpptools code](https://github.com/microsoft/vscode-cpptools/blob/0d91db0e060b946939ee620130c1dbc0fb1d7c42/Extension/src/packageManager.ts#L385-L386)
Co-authored-by: Veetaha <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r-- | editors/code/src/installation/download_file.ts | 8 | ||||
-rw-r--r-- | editors/code/src/installation/language_server.ts | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/editors/code/src/installation/download_file.ts b/editors/code/src/installation/download_file.ts index 8a0766c66..f1f9f4a25 100644 --- a/editors/code/src/installation/download_file.ts +++ b/editors/code/src/installation/download_file.ts | |||
@@ -3,7 +3,7 @@ import * as fs from "fs"; | |||
3 | import { strict as assert } from "assert"; | 3 | import { strict as assert } from "assert"; |
4 | 4 | ||
5 | /** | 5 | /** |
6 | * Downloads file from `url` and stores it at `destFilePath`. | 6 | * Downloads file from `url` and stores it at `destFilePath` with `destFilePermissions`. |
7 | * `onProgress` callback is called on recieveing each chunk of bytes | 7 | * `onProgress` callback is called on recieveing each chunk of bytes |
8 | * to track the progress of downloading, it gets the already read and total | 8 | * to track the progress of downloading, it gets the already read and total |
9 | * amount of bytes to read as its parameters. | 9 | * amount of bytes to read as its parameters. |
@@ -11,6 +11,7 @@ import { strict as assert } from "assert"; | |||
11 | export async function downloadFile( | 11 | export async function downloadFile( |
12 | url: string, | 12 | url: string, |
13 | destFilePath: fs.PathLike, | 13 | destFilePath: fs.PathLike, |
14 | destFilePermissions: number, | ||
14 | onProgress: (readBytes: number, totalBytes: number) => void | 15 | onProgress: (readBytes: number, totalBytes: number) => void |
15 | ): Promise<void> { | 16 | ): Promise<void> { |
16 | const res = await fetch(url); | 17 | const res = await fetch(url); |
@@ -35,6 +36,9 @@ export async function downloadFile( | |||
35 | onProgress(readBytes, totalBytes); | 36 | onProgress(readBytes, totalBytes); |
36 | }) | 37 | }) |
37 | .on("error", reject) | 38 | .on("error", reject) |
38 | .pipe(fs.createWriteStream(destFilePath).on("close", resolve)) | 39 | .pipe(fs |
40 | .createWriteStream(destFilePath, { mode: destFilePermissions }) | ||
41 | .on("close", resolve) | ||
42 | ) | ||
39 | ); | 43 | ); |
40 | } | 44 | } |
diff --git a/editors/code/src/installation/language_server.ts b/editors/code/src/installation/language_server.ts index 3510f9178..52c5cbe7d 100644 --- a/editors/code/src/installation/language_server.ts +++ b/editors/code/src/installation/language_server.ts | |||
@@ -35,7 +35,8 @@ export async function downloadLatestLanguageServer( | |||
35 | }, | 35 | }, |
36 | async (progress, _cancellationToken) => { | 36 | async (progress, _cancellationToken) => { |
37 | let lastPrecentage = 0; | 37 | let lastPrecentage = 0; |
38 | await downloadFile(downloadUrl, installationPath, throttle( | 38 | const filePermissions = 0o755; // (rwx, r_x, r_x) |
39 | await downloadFile(downloadUrl, installationPath, filePermissions, throttle( | ||
39 | 200, | 40 | 200, |
40 | /* noTrailing: */ true, | 41 | /* noTrailing: */ true, |
41 | (readBytes, totalBytes) => { | 42 | (readBytes, totalBytes) => { |
@@ -51,8 +52,6 @@ export async function downloadLatestLanguageServer( | |||
51 | } | 52 | } |
52 | ); | 53 | ); |
53 | console.timeEnd("Downloading ra_lsp_server"); | 54 | console.timeEnd("Downloading ra_lsp_server"); |
54 | |||
55 | await fs.chmod(installationPath, 0o755); // Set (rwx, r_x, r_x) permissions | ||
56 | } | 55 | } |
57 | export async function ensureLanguageServerBinary( | 56 | export async function ensureLanguageServerBinary( |
58 | langServerSource: null | BinarySource | 57 | langServerSource: null | BinarySource |