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

Adds nala on android support (#97)

Browse Source
This commit is contained in:
Thomas Schönauer
2022-11-01 22:20:47 +00:00
committed by GitHub
parent 027c99ea6b
commit 6cb9e96151
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/steps/os/android.rs
View File

@@ -5,27 +5,33 @@ use crate::Step;
use anyhow::Result; use anyhow::Result;
pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> { pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
let pkg = require("pkg")?; //let pkg = require("pkg")?;
let pkg = which("nala").or_else(|| which("pkg")).unwrap();
print_separator("Termux Packages"); print_separator("Termux Packages");
let is_nala = pkg.end_with("nala");
let mut command = ctx.run_type().execute(&pkg); let mut command = ctx.run_type().execute(&pkg);
command.arg("upgrade"); command.arg("upgrade");
if ctx.config().yes(Step::System) { if ctx.config().yes(Step::System) {
command.arg("-y"); command.arg("-y");
} }
command.check_run()?; command.check_run()?;
if ctx.config().cleanup() { if !is_nala {
ctx.run_type().execute(&pkg).arg("clean").check_run()?; if ctx.config().cleanup() {
ctx.run_type().execute(&pkg).arg("clean").check_run()?;
let apt = require("apt")?; let apt = require("apt")?;
let mut command = ctx.run_type().execute(&apt); let mut command = ctx.run_type().execute(&apt);
command.arg("autoremove"); command.arg("autoremove");
if ctx.config().yes(Step::System) { if ctx.config().yes(Step::System) {
command.arg("-y"); command.arg("-y");
}
command.check_run()?;
} }
command.check_run()?;
} }
Ok(()) Ok(())