fix prebuilt binary install

master
Brady Joslin 4 years ago
parent dbf45dfbd1
commit d80aeaf901
  1. 17
      src/install/mod.rs

@ -198,8 +198,9 @@ fn prebuilt_url(tool: &Tool, version: &str) -> Result<String, failure::Error> {
}, },
Tool::CargoGenerate => { Tool::CargoGenerate => {
Ok(format!( Ok(format!(
"https://github.com/ashleygwilliams/cargo-generate/releases/download/v{0}/cargo-generate-v{0}-{1}.tar.gz", "https://github.com/cargo-generate/cargo-generate/releases/download/v{0}/cargo-generate-v{0}-{1}.tar.gz",
Krate::new(&Tool::CargoGenerate)?.max_version, // Krate::new(&Tool::CargoGenerate)?.max_version,
"0.5.1", // latest released binary [#907](https://github.com/rustwasm/wasm-pack/issues/907)
target target
)) ))
}, },
@ -258,20 +259,14 @@ pub fn cargo_install(
}; };
let mut cmd = Command::new("cargo"); let mut cmd = Command::new("cargo");
if version == "latest" {
cmd.arg("install") cmd.arg("install")
.arg("--force") .arg("--force")
.arg(crate_name) .arg(crate_name)
.arg("--root") .arg("--root")
.arg(&tmp); .arg(&tmp);
} else {
cmd.arg("install") if version != "latest" {
.arg("--force") cmd.arg("--version").arg(version);
.arg(crate_name)
.arg("--version")
.arg(version)
.arg("--root")
.arg(&tmp);
} }
let context = format!("Installing {} with cargo", tool); let context = format!("Installing {} with cargo", tool);

Loading…
Cancel
Save