From d800511e46639721dda810f4716b63bc415397d4 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Wed, 10 May 2017 14:31:11 +0200 Subject: [PATCH] For PY-17816 we need only a PATH variable from the environment map Taking more we can override some useful environments set previously, for example locale as it happens here IDEA-171957 --- .../jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt b/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt index b2f31ce15745..c24baa6d1eec 100644 --- a/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt +++ b/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt @@ -56,7 +56,10 @@ class PyVirtualEnvTerminalCustomizer : LocalTerminalCustomizer() { ((shellName == "fish") && PythonSdkType.isVirtualEnv(sdk))) { //fish shell works only for virtualenv and not for conda //for bash we pass activate script to jediterm shell integration (see jediterm-bash.in) to source it there findActivateScript(path, shellPath)?.let { activate -> - envs.putAll(EnvironmentUtil.getEnvironmentMap()) + val pathEnv = EnvironmentUtil.getEnvironmentMap().get("PATH") + if (pathEnv != null) { + envs.put("PATH", pathEnv) + } envs.put("JEDITERM_SOURCE", if (activate.second != null) "${activate.first} ${activate.second}" else activate.first) } }