nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 02:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
Aleksey Kladov 2020-02-14 15:06:10 +01:00
parent a19f52f9ae
commit 52dcf3243e
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xtask/src/install.rs
View File

@ -2,7 +2,7 @@
use std::{env, path::PathBuf, str}; use std::{env, path::PathBuf, str};
use anyhow::{Context, Result}; use anyhow::{bail, format_err, Context, Result};
use crate::cmd::{run, run_with_output, Cmd}; use crate::cmd::{run, run_with_output, Cmd};
@ -55,7 +55,7 @@ fn fix_path_for_mac() -> Result<()> {
const ROOT_DIR: &str = ""; const ROOT_DIR: &str = "";
let home_dir = match env::var("HOME") { let home_dir = match env::var("HOME") {
Ok(home) => home, Ok(home) => home,
Err(e) => anyhow::bail!("Failed getting HOME from environment with error: {}.", e), Err(e) => bail!("Failed getting HOME from environment with error: {}.", e),
}; };
[ROOT_DIR, &home_dir] [ROOT_DIR, &home_dir]
@ -69,7 +69,7 @@ fn fix_path_for_mac() -> Result<()> {
if !vscode_path.is_empty() { if !vscode_path.is_empty() {
let vars = match env::var_os("PATH") { let vars = match env::var_os("PATH") {
Some(path) => path, Some(path) => path,
None => anyhow::bail!("Could not get PATH variable from env."), None => bail!("Could not get PATH variable from env."),
}; };
let mut paths = env::split_paths(&vars).collect::<Vec<_>>(); let mut paths = env::split_paths(&vars).collect::<Vec<_>>();
@ -90,7 +90,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
.run(); .run();
if npm_version.is_err() { if npm_version.is_err() {
eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin") bail!("`npm --version` failed, `npm` is required to build the VS Code plugin")
} }
Cmd { unix: r"npm install", windows: r"cmd.exe /c npm install", work_dir: "./editors/code" } Cmd { unix: r"npm install", windows: r"cmd.exe /c npm install", work_dir: "./editors/code" }
@ -102,7 +102,9 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
} }
.run()?; .run()?;
let code_binary = ["code", "code-insiders", "codium", "code-oss"].iter().find(|bin| { let code_binary = ["code", "code-insiders", "codium", "code-oss"]
.iter()
.find(|bin| {
Cmd { Cmd {
unix: &format!("{} --version", bin), unix: &format!("{} --version", bin),
windows: &format!("cmd.exe /c {}.cmd --version", bin), windows: &format!("cmd.exe /c {}.cmd --version", bin),
@ -110,12 +112,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
} }
.run() .run()
.is_ok() .is_ok()
}); })
.ok_or_else(|| {
let code_binary = match code_binary { format_err!("Can't execute `code --version`. Perhaps it is not in $PATH?")
Some(it) => it, })?;
None => anyhow::bail!("Can't execute `code --version`. Perhaps it is not in $PATH?"),
};
Cmd { Cmd {
unix: &format!(r"{} --install-extension ./rust-analyzer-0.1.0.vsix --force", code_binary), unix: &format!(r"{} --install-extension ./rust-analyzer-0.1.0.vsix --force", code_binary),
@ -135,24 +135,12 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
.run_with_output()?; .run_with_output()?;
if !installed_extensions.contains("rust-analyzer") { if !installed_extensions.contains("rust-analyzer") {
anyhow::bail!( bail!(
"Could not install the Visual Studio Code extension. \ "Could not install the Visual Studio Code extension. \
Please make sure you have at least NodeJS 10.x together with the latest version of VS Code installed and try again." Please make sure you have at least NodeJS 10.x together with the latest version of VS Code installed and try again."
); );
} }
if installed_extensions.contains("ra-lsp") {
Cmd {
unix: &format!(r"{} --uninstall-extension matklad.ra-lsp", code_binary),
windows: &format!(
r"cmd.exe /c {}.cmd --uninstall-extension matklad.ra-lsp",
code_binary
),
work_dir: "./editors/code",
}
.run()?;
}
Ok(()) Ok(())
} }