Merge #11144

bors[bot] · lnicola · web-flow · commit 3d63abf1d868 · 2021-12-30T12:52:05.000Z
11144: fix: Fix server path on NixOS r=lnicola a=lnicola See c0d0cee#commitcomment-62688259. bors r+ Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
@@ -243,8 +243,8 @@ async function getServer(context: vscode.ExtensionContext, config: Config, state
             if (!exists) {
                 await vscode.workspace.fs.copy(bundled, dest);
                 await patchelf(dest);
-                server = dest;
             }
+            server = dest;
         }
         await state.updateServerVersion(config.package.version);
         return server.fsPath;

Original file line number	Diff line number	Diff line change
`@@ -243,8 +243,8 @@ async function getServer(context: vscode.ExtensionContext, config: Config, state`
`243`	`243`	`if (!exists) {`
`244`	`244`	`await vscode.workspace.fs.copy(bundled, dest);`
`245`	`245`	`await patchelf(dest);`
`246`		`- server = dest;`
`247`	`246`	`}`
	`247`	`+ server = dest;`
`248`	`248`	`}`
`249`	`249`	`await state.updateServerVersion(config.package.version);`
`250`	`250`	`return server.fsPath;`