Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-19 17:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ports: support resolver tunnel factories on the web (#186937)

Browse Source 
@alexr00 I just copied the non-Node.js-specific code into the base port
class and things seem to work. What do you think?

Fixes https://github.com/microsoft/vscode-remote-release/issues/8595
This commit is contained in:
Connor Peet
2023-07-04 03:11:09 -07:00
committed by GitHub
parent 37b304f2f3
commit 0207c66c87
4 changed files with 199 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cli/src/tunnels/paths.rs
View File

@@ -91,10 +91,15 @@ impl InstalledServer {
pub fn server_paths(&self, p: &LauncherPaths) -> ServerPaths {
let server_dir = self.get_install_folder(p);
ServerPaths {
executable: server_dir
.join(SERVER_FOLDER_NAME)
.join("bin")
.join(self.quality.server_entrypoint()),
// allow using the OSS server in development via an override
executable: if let Some(p) = option_env!("VSCODE_CLI_OVERRIDE_SERVER_PATH") {
PathBuf::from(p)
} else {
server_dir
.join(SERVER_FOLDER_NAME)
.join("bin")
.join(self.quality.server_entrypoint())
},
logfile: server_dir.join("log.txt"),
pidfile: server_dir.join("pid.txt"),
server_dir,