#851: implemented requested changes

added checks for idea and studio files as well als idea.sh and studio.sh
devonfw · Dec 9, 2024 · 69b781a · 69b781a
1 parent cd0feb8
commit 69b781a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudio.java b/cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudio.java
@@ -1,5 +1,6 @@
 package com.devonfw.tools.ide.tool.androidstudio;
 
+import java.nio.file.Files;
 import java.util.Set;
 
 import com.devonfw.tools.ide.common.Tag;
@@ -18,6 +19,8 @@ public class AndroidStudio extends IdeaBasedIdeToolCommandlet {
 
   private static final String STUDIO64_EXE = STUDIO + "64.exe";
 
+  private static final String STUDIO_BASH_SCRIPT = STUDIO + ".sh";
+
   /**
    * The constructor.
    *
@@ -34,7 +37,13 @@ protected String getBinaryName() {
     if (this.context.getSystemInfo().isWindows()) {
       return STUDIO64_EXE;
     } else {
-      return STUDIO;
+      if (Files.exists(this.getToolBinPath().resolve(STUDIO))) {
+        return STUDIO;
+      } else if (Files.exists(this.getToolBinPath().resolve(STUDIO_BASH_SCRIPT))) {
+        return STUDIO_BASH_SCRIPT;
+      } else {
+        return STUDIO;
+      }
     }
   }
 

diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/Intellij.java b/cli/src/main/java/com/devonfw/tools/ide/tool/intellij/Intellij.java
@@ -1,5 +1,6 @@
 package com.devonfw.tools.ide.tool.intellij;
 
+import java.nio.file.Files;
 import java.util.Set;
 
 import com.devonfw.tools.ide.common.Tag;
@@ -19,6 +20,8 @@ public class Intellij extends IdeaBasedIdeToolCommandlet {
 
   private static final String IDEA64_EXE = IDEA + "64.exe";
 
+  private static final String IDEA_BASH_SCRIPT = IDEA + ".sh";
+
   /**
    * The constructor.
    *
@@ -35,7 +38,13 @@ protected String getBinaryName() {
     if (this.context.getSystemInfo().isWindows()) {
       return IDEA64_EXE;
     } else {
-      return IDEA;
+      if (Files.exists(this.getToolBinPath().resolve(IDEA))) {
+        return IDEA;
+      } else if (Files.exists(this.getToolBinPath().resolve(IDEA_BASH_SCRIPT))) {
+        return IDEA_BASH_SCRIPT;
+      } else {
+        return IDEA;
+      }
     }
   }