From b2dfd87219f0c3256262568bc0b0b2e7784b4210 Mon Sep 17 00:00:00 2001 From: Boris Smidt Date: Mon, 19 Aug 2024 10:23:18 +0200 Subject: [PATCH 1/4] Add aqua cli --- src/config.rs | 1 + src/main.rs | 1 + src/steps/os/unix.rs | 10 ++++++++++ 3 files changed, 12 insertions(+) diff --git a/src/config.rs b/src/config.rs index 017365e6..c3e29153 100644 --- a/src/config.rs +++ b/src/config.rs @@ -53,6 +53,7 @@ pub enum Step { AppMan, Asdf, Atom, + Aqua, Audit, AutoCpufreq, Bin, diff --git a/src/main.rs b/src/main.rs index 11438d0f..54966b68 100644 --- a/src/main.rs +++ b/src/main.rs @@ -300,6 +300,7 @@ fn run() -> Result<()> { runner.execute(Step::HomeManager, "home-manager", || unix::run_home_manager(&ctx))?; runner.execute(Step::Asdf, "asdf", || unix::run_asdf(&ctx))?; runner.execute(Step::Mise, "mise", || unix::run_mise(&ctx))?; + runner.execute(Step::Aqua, "aqua", || unix::run_aqua(&ctx))?; runner.execute(Step::Pkgin, "pkgin", || unix::run_pkgin(&ctx))?; runner.execute(Step::Bun, "bun", || unix::run_bun(&ctx))?; runner.execute(Step::BunPackages, "bun-packages", || unix::run_bun_packages(&ctx))?; diff --git a/src/steps/os/unix.rs b/src/steps/os/unix.rs index 9f92db78..493a9d1a 100644 --- a/src/steps/os/unix.rs +++ b/src/steps/os/unix.rs @@ -749,6 +749,16 @@ pub fn run_maza(ctx: &ExecutionContext) -> Result<()> { ctx.run_type().execute(maza).arg("update").status_checked() } +pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> { + let aqua = require("aqua")?; + + print_separator("Aqua"); + + ctx.run_type().execute(&aqua).arg("update-aqua").status_checked()?; + + ctx.run_type().execute(&aqua).args(["update"]).status_checked() +} + pub fn reboot() -> Result<()> { print!("Rebooting..."); From 49f3886e344d26fe89ce908ced77f18aa3b9fbb4 Mon Sep 17 00:00:00 2001 From: Boris Smidt Date: Mon, 19 Aug 2024 14:40:27 +0200 Subject: [PATCH 2/4] Move aqua cli to generic.rs --- src/main.rs | 2 +- src/steps/generic.rs | 10 ++++++++++ src/steps/os/unix.rs | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index 54966b68..4b743bd0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -300,7 +300,6 @@ fn run() -> Result<()> { runner.execute(Step::HomeManager, "home-manager", || unix::run_home_manager(&ctx))?; runner.execute(Step::Asdf, "asdf", || unix::run_asdf(&ctx))?; runner.execute(Step::Mise, "mise", || unix::run_mise(&ctx))?; - runner.execute(Step::Aqua, "aqua", || unix::run_aqua(&ctx))?; runner.execute(Step::Pkgin, "pkgin", || unix::run_pkgin(&ctx))?; runner.execute(Step::Bun, "bun", || unix::run_bun(&ctx))?; runner.execute(Step::BunPackages, "bun-packages", || unix::run_bun_packages(&ctx))?; @@ -421,6 +420,7 @@ fn run() -> Result<()> { })?; runner.execute(Step::Poetry, "Poetry", || generic::run_poetry(&ctx))?; runner.execute(Step::Zvm, "ZVM", || generic::run_zvm(&ctx))?; + runner.execute(Step::Aqua, "aqua", || generic::run_aqua(&ctx))?; if should_run_powershell { runner.execute(Step::Powershell, "Powershell Modules Update", || { diff --git a/src/steps/generic.rs b/src/steps/generic.rs index dce89ec7..b0dff9b4 100644 --- a/src/steps/generic.rs +++ b/src/steps/generic.rs @@ -224,6 +224,16 @@ pub fn run_apm(ctx: &ExecutionContext) -> Result<()> { .status_checked() } +pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> { + let aqua = require("aqua")?; + + print_separator("Aqua"); + + ctx.run_type().execute(&aqua).arg("update-aqua").status_checked()?; + + ctx.run_type().execute(&aqua).args(["update"]).status_checked() +} + pub fn run_rustup(ctx: &ExecutionContext) -> Result<()> { let rustup = require("rustup")?; diff --git a/src/steps/os/unix.rs b/src/steps/os/unix.rs index 493a9d1a..9f92db78 100644 --- a/src/steps/os/unix.rs +++ b/src/steps/os/unix.rs @@ -749,16 +749,6 @@ pub fn run_maza(ctx: &ExecutionContext) -> Result<()> { ctx.run_type().execute(maza).arg("update").status_checked() } -pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> { - let aqua = require("aqua")?; - - print_separator("Aqua"); - - ctx.run_type().execute(&aqua).arg("update-aqua").status_checked()?; - - ctx.run_type().execute(&aqua).args(["update"]).status_checked() -} - pub fn reboot() -> Result<()> { print!("Rebooting..."); From af969d496ebbeda05c9b079d95a98a651a3fc25e Mon Sep 17 00:00:00 2001 From: Boris Smidt Date: Mon, 19 Aug 2024 16:07:21 +0200 Subject: [PATCH 3/4] Add a dry-run support to aqua --- src/steps/generic.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/steps/generic.rs b/src/steps/generic.rs index b0dff9b4..d374f6f8 100644 --- a/src/steps/generic.rs +++ b/src/steps/generic.rs @@ -228,10 +228,14 @@ pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> { let aqua = require("aqua")?; print_separator("Aqua"); - - ctx.run_type().execute(&aqua).arg("update-aqua").status_checked()?; - - ctx.run_type().execute(&aqua).args(["update"]).status_checked() + if ctx.run_type().dry() { + println!("Updating aqua ..."); + println!("Updating aqua installed cli tools ..."); + Ok(()) + } else { + ctx.run_type().execute(&aqua).arg("update-aqua").status_checked()?; + ctx.run_type().execute(&aqua).arg("update").status_checked() + } } pub fn run_rustup(ctx: &ExecutionContext) -> Result<()> { From 988ca3e7831a3c946154435338b1536e81432d66 Mon Sep 17 00:00:00 2001 From: Steve Lau Date: Tue, 20 Aug 2024 09:14:01 +0800 Subject: [PATCH 4/4] style: format code --- src/steps/generic.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/steps/generic.rs b/src/steps/generic.rs index d374f6f8..f2c5e1e8 100644 --- a/src/steps/generic.rs +++ b/src/steps/generic.rs @@ -229,9 +229,9 @@ pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> { print_separator("Aqua"); if ctx.run_type().dry() { - println!("Updating aqua ..."); - println!("Updating aqua installed cli tools ..."); - Ok(()) + println!("Updating aqua ..."); + println!("Updating aqua installed cli tools ..."); + Ok(()) } else { ctx.run_type().execute(&aqua).arg("update-aqua").status_checked()?; ctx.run_type().execute(&aqua).arg("update").status_checked()