itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-10-02 15:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 Check if a crate is installed before triying to install it

Browse Source
This commit is contained in:
Sergio Gasquez 2022-09-28 18:46:34 +02:00
parent 253ef013e4
commit f700e92820
1 changed files with 95 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/rust_toolchain.rs
View File

@ -154,72 +154,108 @@ pub struct RustCrate {
impl RustCrate { impl RustCrate {
/// Installs a crate. /// Installs a crate.
pub fn install(&self) -> Result<()> { pub fn install(&self) -> Result<()> {
cmd!("cargo", "install", "cargo-binstall").run()?; let output = cmd!("cargo", "install", "--list").stdout()?;
info!("{} Installing {} crate", emoji::WRENCH, self.name); if output.contains(&self.name) {
if let Some(binstall) = &self.binstall { warn!("{} {} is already installed", emoji::WARN, self.name);
cmd!( Ok(())
"cargo",
"binstall",
"--no-confirm",
"--pkg-url",
&binstall.url,
"--pkg-fmt",
&binstall.fmt,
"--bin-dir",
&binstall.bin,
&self.name
)
.run()?;
} else { } else {
cmd!("cargo", "install", &self.name).run()?; info!("{} Installing {} crate", emoji::WRENCH, self.name);
if let Some(binstall) = &self.binstall {
// TODO: Fix this as is not picking the arguments properly
if !output.contains("cargo-binstall") {
info!("{} Installing cargo-binstall crate", emoji::WRENCH);
cmd!("cargo", "install", "cargo-binstall").run()?;
}
println!(
"cargo binstall --no-confirm --pkg-url {} --pkg-fmt {} --bin-dir {}",
binstall.url, binstall.fmt, binstall.bin
);
cmd!(
"cargo",
"binstall",
"--no-confirm",
"--pkg-url",
&binstall.url,
"--pkg-fmt",
&binstall.fmt,
"--bin-dir",
&binstall.bin,
&self.name
)
.run()?;
} else {
cmd!("cargo", "install", &self.name).run()?;
}
Ok(())
} }
Ok(())
} }
/// Create a crate instance. /// Create a crate instance.
pub fn new(name: &str) -> Self { pub fn new(name: &str) -> Self {
match name { RustCrate {
// "ldproxy" => { name: name.to_string(),
// RustCrate { binstall: None,
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "{ repo }/releases/download/{ name }-v{ version }/{ name }-{ target }.{ archive-format }".to_string(),
// bin: "{ bin }{ binary-ext }".to_string(),
// fmt: "zip".to_string(),
// }),
// }
// }
// "espflash" => {
// RustCrate {
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "{ repo }/releases/download/{ name }-v{ version }/{ name }-{ target }.{ archive-format }".to_string(),
// bin: "{ bin }{ binary-ext }".to_string(),
// fmt: "zip".to_string(),
// }),
// }
// }
"cargo-generate" => {
RustCrate {
name: name.to_string() + "@0.15.2",
binstall: Some(BinstallCrate {
url: "{ repo }/releases/download/v{ version }/{ name}-{ version }-{ target }.{ archive-format }".to_string(),
bin: "{ bin }{ binary-ext }".to_string(),
fmt: "tgz".to_string(),
}),
}
}
// "wokwi-server" => {
// },
// "web-flash" => {
// },
_ => RustCrate {
name: name.to_string(),
binstall: None,
},
} }
// match name {
// "ldproxy" => {
// RustCrate {
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "{ repo }/releases/download/{ name }-v{ version }/{ name }-{ target }.{ archive-format }".to_string(),
// bin: "{ bin }{ binary-ext }".to_string(),
// fmt: "zip".to_string(),
// }),
// }
// }
// "espflash" => {
// RustCrate {
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "{ repo }/releases/download/{ name }-v{ version }/{ name }-{ target }.{ archive-format }".to_string(),
// bin: "{ bin }{ binary-ext }".to_string(),
// fmt: "zip".to_string(),
// }),
// }
// }
// "cargo-generate" => {
// RustCrate {
// name: name.to_string() + "@0.15.2",
// binstall: Some(BinstallCrate {
// url: "{ repo }/releases/download/v{ version }/{ name }-{ version }-{ target }.{ archive-format }".to_string(),
// bin: "{ bin }{ binary-ext }".to_string(),
// fmt: "tgz".to_string(),
// }),
// }
// }
// "sccache" => RustCrate {
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "".to_string(),
// bin: "".to_string(),
// fmt: "".to_string(),
// }),
// },
// "wokwi-server" => RustCrate {
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "".to_string(),
// bin: "".to_string(),
// fmt: "".to_string(),
// }),
// },
// "web-flash" => RustCrate {
// name: name.to_string(),
// binstall: Some(BinstallCrate {
// url: "".to_string(),
// bin: "".to_string(),
// fmt: "".to_string(),
// }),
// },
// _ => RustCrate {
// name: name.to_string(),
// binstall: None,
// },
// }
} }
} }