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

Replace the apt step with nala if installed. (#914)

Browse Source
This commit is contained in:
Roey Darwish Dror
2022-05-09 06:44:39 +03:00
committed by GitHub
parent c166d51fb8
commit 1e25926999
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/steps/os/linux.rs
View File

@@ -283,11 +283,22 @@ fn upgrade_gentoo(ctx: &ExecutionContext) -> Result<()> {
fn upgrade_debian(ctx: &ExecutionContext) -> Result<()> { fn upgrade_debian(ctx: &ExecutionContext) -> Result<()> {
if let Some(sudo) = &ctx.sudo() { if let Some(sudo) = &ctx.sudo() {
let apt = which("apt-fast").unwrap_or_else(|| PathBuf::from("apt-get")); let apt = which("apt-fast")
ctx.run_type().execute(&sudo).arg(&apt).arg("update").check_run()?; .or_else(|| which("nala"))
.unwrap_or_else(|| PathBuf::from("apt-get"));
let is_nala = apt.ends_with("nala");
if !is_nala {
ctx.run_type().execute(&sudo).arg(&apt).arg("update").check_run()?;
}
let mut command = ctx.run_type().execute(&sudo); let mut command = ctx.run_type().execute(&sudo);
command.arg(&apt).arg("dist-upgrade"); command.arg(&apt);
if is_nala {
command.arg("upgrade");
} else {
command.arg("dist-upgrade");
};
if ctx.config().yes(Step::System) { if ctx.config().yes(Step::System) {
command.arg("-y"); command.arg("-y");
} }