admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better cargo update detection (#725)

Browse Source
This commit is contained in:
Roey Darwish Dror
2021-06-04 14:17:40 +03:00
committed by GitHub
parent 9205649a5f
commit fcd4a8b908
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/steps/generic.rs
View File

@@ -2,7 +2,7 @@
use crate::execution_context::ExecutionContext; use crate::execution_context::ExecutionContext;
use crate::executor::{CommandExt, ExecutorOutput, RunType}; use crate::executor::{CommandExt, ExecutorOutput, RunType};
use crate::terminal::{print_separator, shell}; use crate::terminal::{print_separator, shell};
use crate::utils::{self, PathExt}; use crate::utils::{self, require_option, PathExt};
use crate::{ use crate::{
error::{SkipStep, TopgradeError}, error::{SkipStep, TopgradeError},
terminal::print_warning, terminal::print_warning,
@@ -17,11 +17,17 @@ use std::{fs, io::Write};
use tempfile::tempfile_in; use tempfile::tempfile_in;
pub fn run_cargo_update(ctx: &ExecutionContext) -> Result<()> { pub fn run_cargo_update(ctx: &ExecutionContext) -> Result<()> {
utils::require("cargo")?;
let cargo_dir = env::var_os("CARGO_HOME") let cargo_dir = env::var_os("CARGO_HOME")
.map(PathBuf::from) .map(PathBuf::from)
.unwrap_or_else(|| ctx.base_dirs().home_dir().join(".cargo")) .unwrap_or_else(|| ctx.base_dirs().home_dir().join(".cargo"))
.require()?; .require()?;
utils::require("cargo").or_else(|_| {
require_option(
cargo_dir.join("bin/cargo").if_exists(),
String::from("No cargo detected"),
)
})?;
let toml_file = cargo_dir.join(".crates.toml").require()?; let toml_file = cargo_dir.join(".crates.toml").require()?;
if fs::metadata(&toml_file)?.len() == 0 { if fs::metadata(&toml_file)?.len() == 0 {
@@ -29,12 +35,15 @@ pub fn run_cargo_update(ctx: &ExecutionContext) -> Result<()> {
} }
print_separator("Cargo"); print_separator("Cargo");
let cargo_update = utils::require("cargo-install-update")
let cargo_update = match utils::require("cargo-install-update") { .ok()
Ok(e) => e, .or_else(|| cargo_dir.join("bin/cargo-install-update").if_exists());
Err(e) => { let cargo_update = match cargo_update {
print_warning("cargo-update isn't installed so Topgrade can't upgrade cargo packages.\nInstall cargo-update by running `cargo install cargo-update`"); Some(e) => e,
return Err(e); None => {
let message = String::from("cargo-update isn't installed so Topgrade can't upgrade cargo packages.\nInstall cargo-update by running `cargo install cargo-update`");
print_warning(&message);
return Err(SkipStep(message).into());
} }
}; };