Merge #2758

bors[bot] · llebout · web-flow · commit 2a8dd492a8e0 · 2020-01-07T16:18:07.000Z
2758: Add "code-oss" Visual Studio Code binary name r=matklad a=leo-lb

When Visual Studio Code is manually compiled from the upstream
source tree the binary is named "code-oss".

Co-authored-by: leo-lb &lt;lle-bout@zaclys.net&gt;
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
@@ -91,7 +91,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     }
     .run()?;
 
-    let code_binary = ["code", "code-insiders", "codium"].iter().find(|bin| {
+    let code_binary = ["code", "code-insiders", "codium", "code-oss"].iter().find(|bin| {
         Cmd {
             unix: &format!("{} --version", bin),
             windows: &format!("cmd.exe /c {}.cmd --version", bin),

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {`
`91`	`91`	`}`
`92`	`92`	`.run()?;`
`93`	`93`
`94`		`- let code_binary = ["code", "code-insiders", "codium"].iter().find(\|bin\| {`
	`94`	`+ let code_binary = ["code", "code-insiders", "codium", "code-oss"].iter().find(\|bin\| {`
`95`	`95`	`Cmd {`
`96`	`96`	`unix: &format!("{} --version", bin),`
`97`	`97`	`windows: &format!("cmd.exe /c {}.cmd --version", bin),`