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

[🐛 FIX] --cleanup --yes for arch & prioritize yay (#258)

Browse Source
This commit is contained in:
Andrei Pavel
2019-11-20 09:10:15 +02:00
committed by Roey Darwish Dror
parent d62a3385f8
commit f506d52309
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,11 +152,11 @@ fn upgrade_arch_linux(
.and_then(|mut p| p.wait()) .and_then(|mut p| p.wait())
.ok(); .ok();
let mut command = run_type.execute(yay); let mut command = run_type.execute(&yay);
command command
.arg("--pacman") .arg("--pacman")
.arg(pacman) .arg(&pacman)
.arg("-Syu") .arg("-Syu")
.args(yay_arguments.split_whitespace()) .args(yay_arguments.split_whitespace())
.env("PATH", path); .env("PATH", path);
@@ -165,23 +165,35 @@ fn upgrade_arch_linux(
command.arg("--noconfirm"); command.arg("--noconfirm");
} }
command.check_run()?; command.check_run()?;
if cleanup {
let mut command = run_type.execute(&yay);
command.arg("--pacman").arg(&pacman).arg("-Scc");
if yes {
command.arg("--noconfirm");
}
command.check_run()?;
}
} else if let Some(sudo) = &sudo { } else if let Some(sudo) = &sudo {
let mut command = run_type.execute(&sudo); let mut command = run_type.execute(&sudo);
command.arg(pacman).arg("-Syu").env("PATH", path); command.arg(&pacman).arg("-Syu").env("PATH", path);
if yes { if yes {
command.arg("--noconfirm"); command.arg("--noconfirm");
} }
command.check_run()?; command.check_run()?;
if cleanup {
let mut command = run_type.execute(&sudo);
command.arg(&pacman).arg("-Scc");
if yes {
command.arg("--noconfirm");
}
command.check_run()?;
}
} else { } else {
print_warning("Neither sudo nor yay detected. Skipping system upgrade"); print_warning("Neither sudo nor yay detected. Skipping system upgrade");
} }
if cleanup {
if let Some(sudo) = &sudo {
run_type.execute(&sudo).args(&["/usr/bin/pacman", "-Scc"]).check_run()?;
}
}
Ok(()) Ok(())
} }