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

Arch - Use powerpill if present

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-07-15 09:40:12 +03:00
parent 7b667cbfcf
commit 5934883a79
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/linux.rs
View File

@@ -107,6 +107,8 @@ pub fn show_pacnew() {
} }
fn upgrade_arch_linux(sudo: &Option<PathBuf>, cleanup: bool, run_type: RunType) -> Result<(), Error> { fn upgrade_arch_linux(sudo: &Option<PathBuf>, cleanup: bool, run_type: RunType) -> Result<(), Error> {
let pacman = which("powerpill").unwrap_or(PathBuf::from("/usr/bin/pacman"));
if let Some(yay) = which("yay") { if let Some(yay) = which("yay") {
if let Some(python) = which("python") { if let Some(python) = which("python") {
if python != PathBuf::from("/usr/bin/python") { if python != PathBuf::from("/usr/bin/python") {
@@ -118,9 +120,14 @@ It's dangerous to run yay since Python based AUR packages will be installed in t
return Err(ErrorKind::NotSystemPython)?; return Err(ErrorKind::NotSystemPython)?;
} }
} }
run_type.execute(yay).check_run()?; run_type
.execute(yay)
.arg("--pacman")
.arg(pacman)
.arg("-Syu")
.check_run()?;
} else if let Some(sudo) = &sudo { } else if let Some(sudo) = &sudo {
run_type.execute(&sudo).args(&["/usr/bin/pacman", "-Syu"]).check_run()?; run_type.execute(&sudo).arg(pacman).arg("-Syu").check_run()?;
} else { } else {
print_warning("No sudo or yay detected. Skipping system upgrade"); print_warning("No sudo or yay detected. Skipping system upgrade");
} }