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

Handle a case where asdf is installed using a package manager (fix #374)

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-03-17 22:49:07 +02:00
committed by GitHub
parent 30505f7751
commit 44d4b8a566
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/steps/os/unix.rs
View File

@@ -1,7 +1,8 @@
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use crate::error::SkipStep; use crate::error::SkipStep;
use crate::error::TopgradeError;
use crate::execution_context::ExecutionContext; use crate::execution_context::ExecutionContext;
use crate::executor::{CommandExt, RunType}; use crate::executor::{CommandExt, ExecutorExitStatus, RunType};
use crate::terminal::{print_separator, print_warning}; use crate::terminal::{print_separator, print_warning};
use crate::utils::{require, PathExt}; use crate::utils::{require, PathExt};
use anyhow::Result; use anyhow::Result;
@@ -95,7 +96,13 @@ pub fn run_asdf(run_type: RunType) -> Result<()> {
let asdf = require("asdf")?; let asdf = require("asdf")?;
print_separator("asdf"); print_separator("asdf");
run_type.execute(&asdf).arg("update").check_run()?; let exit_status = run_type.execute(&asdf).arg("update").spawn()?.wait()?;
if let ExecutorExitStatus::Wet(e) = exit_status {
if !(e.success() || e.code().map(|c| c == 42).unwrap_or(false)) {
return Err(TopgradeError::ProcessFailed(e).into());
}
}
run_type.execute(&asdf).args(&["plugin", "update", "--all"]).check_run() run_type.execute(&asdf).args(&["plugin", "update", "--all"]).check_run()
} }