MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed parent parameters inlining for environment variables

Browse Source
This commit is contained in:
Alexandr Evstigneev
2017-09-06 18:36:28 +03:00
parent 36fc29f4ff
commit f785d897ab
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/EnvironmentUtil.java
+5 -2
View File
@@ -339,12 +339,15 @@ public class EnvironmentUtil {
}
public static void inlineParentOccurrences(@NotNull Map<String, String> envs) {
Map<String, String> parentParams = new HashMap<String, String>(System.getenv());
inlineParentOccurrences(envs, new HashMap<String, String>(System.getenv()));
}
public static void inlineParentOccurrences(@NotNull Map<String, String> envs, @NotNull Map<String, String> parentEnv) {
for (Map.Entry<String, String> entry : envs.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if (value != null) {
String parentVal = parentParams.get(key);
String parentVal = parentEnv.get(key);
if (parentVal != null && containsEnvKeySubstitution(key, value)) {
envs.put(key, value.replace("$" + key + "$", parentVal));
}