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

Fix aqua CLI and JetBrains Aqua conflict (#1092)

Browse Source
This commit is contained in:
Gideon
2025-04-03 11:40:52 +02:00
committed by GitHub
parent 481a942b76
commit 5a7958d20e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/steps/generic.rs
View File

@@ -226,6 +226,13 @@ pub fn run_apm(ctx: &ExecutionContext) -> Result<()> {
pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> { pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> {
let aqua = require("aqua")?; let aqua = require("aqua")?;
// Check if `aqua --help` mentions "aqua". JetBrains aqua does not, aqua CLI does.
let output = ctx.run_type().execute(&aqua).arg("--help").output_checked()?;
if !String::from_utf8(output.stdout)?.contains("aqua") {
return Err(SkipStep("Command aqua probably points to JetBrains Aqua".to_string()).into());
}
print_separator("Aqua"); print_separator("Aqua");
if ctx.run_type().dry() { if ctx.run_type().dry() {
println!("{}", t!("Updating aqua ...")); println!("{}", t!("Updating aqua ..."));