Merge pull request #11080 from srnagar/azd-mac

Update MacOS to use absolute path

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/TerminalUtils.java

@@ -79,9 +79,12 @@ public static TerminalWidget getOrCreateTerminalWidget(@Nonnull Project project,
     }
 
     @Nonnull
-    public static TerminalWidget getTerminalWidget(@Nonnull Project project, @Nullable Path workingDir, String terminalTabTitle) {
+    public static synchronized TerminalWidget getTerminalWidget(@Nonnull Project project, @Nullable Path workingDir, String terminalTabTitle) {
         final TerminalToolWindowManager manager = TerminalToolWindowManager.getInstance(project);
         final String workingDirectory = Optional.ofNullable(workingDir).map(Path::toString).orElse(null);
+        if (manager.getToolWindow() != null) {
+            manager.getToolWindow().show();
+        }
         return manager.getTerminalWidgets().stream()
                 .filter(widget -> StringUtils.isBlank(terminalTabTitle) ||
                         StringUtils.equals(widget.getTerminalTitle().buildTitle(), terminalTabTitle))

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-service-explorer/src/main/java/com/microsoft/azure/toolkit/intellij/explorer/azd/AzdNode.java

@@ -15,11 +15,11 @@
 import com.microsoft.azure.toolkit.ide.common.component.Node;
 import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons;
 import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
-import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -36,7 +36,8 @@ public final class AzdNode extends Node<String> {
 
     private static final String WIN_AZD_INSTALL_COMMAND = "winget install microsoft.azd";
     private static final String LINUX_AZD_INSTALL_COMMAND = "set -o pipefail && curl -fsSL https://aka.ms/install-azd.sh | bash";
-    private static final String MAC_AZD_INSTALL_COMMAND = "brew tap azure/azd && brew install azd";
+    private static final String BREW_PATH = getBrewPath();
+    private static final String MAC_AZD_INSTALL_COMMAND = "source ~/.zshrc && " + BREW_PATH + " tap azure/azd && " + BREW_PATH + " install azd";
 
     private final Project project;
 
@@ -198,19 +199,21 @@ private static String runAsBackgroundTask(String command, Consumer<String> onErr
             final String os = System.getProperty("os.name").toLowerCase();
             if (SystemUtils.IS_OS_WINDOWS) {
                 processBuilder.command("cmd", "/c", command); // Windows
+            } else if (SystemUtils.IS_OS_MAC) {
+                processBuilder.command("zsh", "-c", command); // Mac
             } else {
-                processBuilder.command("bash", "-c", command); // Linux/Unix
+                processBuilder.command("bash", "-c", command); // Linux
             }
 
-            Process process = processBuilder.start();
+            final Process process = processBuilder.start();
 
             // Read the command output
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-                String output = reader.lines().collect(Collectors.joining("<br>"));
-                int exitCode = process.waitFor();
+            try (final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                final String output = reader.lines().collect(Collectors.joining("<br>"));
+                final int exitCode = process.waitFor();
                 if (exitCode != 0) {
-                    try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
-                        String error = errorReader.lines().collect(Collectors.joining("<br>"));
+                    try (final BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+                        final String error = errorReader.lines().collect(Collectors.joining("<br>"));
                         if (onError != null) {
                             onError.accept(error);
                         }
@@ -219,8 +222,25 @@ private static String runAsBackgroundTask(String command, Consumer<String> onErr
                 }
                 return output;
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             return null;
         }
     }
+
+    private static String getBrewPath() {
+        // Try common brew locations
+        final String[] possiblePaths = {
+                "/opt/homebrew/bin/brew",  // Apple Silicon
+                "/usr/local/bin/brew"      // Intel Mac
+        };
+
+        for (final String path : possiblePaths) {
+            if (new File(path).exists()) {
+                return path;
+            }
+        }
+
+        // Fallback to PATH lookup
+        return "brew";
+    }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-service-explorer/src/main/java/com/microsoft/azure/toolkit/intellij/explorer/azd/AzdUtils.java

@@ -14,7 +14,6 @@
 import javax.annotation.Nullable;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 import static com.microsoft.azure.toolkit.intellij.common.TerminalUtils.getTerminalWidget;