From 5a7958d20e7e66fb3214dfbc9830351cf630e7e2 Mon Sep 17 00:00:00 2001
From: Gideon <87426140+GideonBear@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:40:52 +0200
Subject: [PATCH] Fix aqua CLI and JetBrains Aqua conflict (#1092)

---
 src/steps/generic.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/steps/generic.rs b/src/steps/generic.rs
index 95f98a66..17786c4d 100644
--- a/src/steps/generic.rs
+++ b/src/steps/generic.rs
@@ -226,6 +226,13 @@ pub fn run_apm(ctx: &ExecutionContext) -> Result<()> {
 pub fn run_aqua(ctx: &ExecutionContext) -> Result<()> {
     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");
     if ctx.run_type().dry() {
         println!("{}", t!("Updating aqua ..."));