Skip to content

IEP-1644 Release 3.7.0 regression testing: Terminal does not work #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2025
Merged

IEP-1644 Release 3.7.0 regression testing: Terminal does not work #1325

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dfe0aa
fix: avoiding duplicate PATH variable
sigmaaa Oct 13, 2025
59a6b5d
fix: improving logic with selecting keyPath
sigmaaa Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/IDFUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,9 @@ public static Map<String, String> getSystemEnv()
env.put(IDFCorePreferenceConstants.IDF_TOOLS_PATH, idfToolsPath);

// Merge Homebrew bin paths into PATH
String existingPath = env.getOrDefault("PATH", ""); //$NON-NLS-1$ //$NON-NLS-2$
// Windows may use "Path" while Unix uses "PATH"
String keyPath = env.containsKey("PATH") ? "PATH" : "Path"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
String existingPath = env.getOrDefault(keyPath, ""); //$NON-NLS-1$
StringBuilder newPath = new StringBuilder();

String[] brewPaths = { "/usr/local/bin", "/opt/homebrew/bin" }; //$NON-NLS-1$ //$NON-NLS-2$
Expand All @@ -915,7 +917,7 @@ public static Map<String, String> getSystemEnv()

// Append the original PATH at the end
newPath.append(existingPath);
env.put("PATH", newPath.toString()); //$NON-NLS-1$
env.put(keyPath, newPath.toString()); // $NON-NLS-1$

return env;
}
Expand Down
Loading