Unnamed repository; edit this file 'description' to name the repository.
Merge #11710
11710: editors/code: fix crash due to missing ID= field r=lnicola a=cab404 Assuming ID=linux by default. Also removed toLowerCase — it really shouldn't be needed. Fixes #11709 Co-authored-by: Vladimir Serov <[email protected]>
bors[bot] 2022-03-15
parent 683fea4 · parent f7cf3b5 · commit 88ade42
-rw-r--r--editors/code/src/main.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 4856079f68..06e5c1185d 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -269,8 +269,8 @@ function serverPath(config: Config): string | null {
async function isNixOs(): Promise<boolean> {
try {
const contents = (await vscode.workspace.fs.readFile(vscode.Uri.file("/etc/os-release"))).toString();
- const idString = contents.split('\n').find((a) => a.startsWith("ID="));
- return idString?.toLowerCase()?.indexOf("nixos") !== -1;
+ const idString = contents.split('\n').find((a) => a.startsWith("ID=")) || "ID=linux";
+ return idString.indexOf("nixos") !== -1;
} catch {
return false;
}