Merge remote-tracking branch 'origin/master'

diff --git a/bin/linux/printenv.py b/bin/linux/printenv.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/python/src/com/jetbrains/python/run/PyVirtualEnvReader.kt b/python/src/com/jetbrains/python/run/PyVirtualEnvReader.kt
index 0bd285226fe944dd5809bdcbc493727023c1e0f4..2e26059160659d37d3cb0a93a18b11fb6904ad84 100644 (file)
--- a/python/src/com/jetbrains/python/run/PyVirtualEnvReader.kt
+++ b/python/src/com/jetbrains/python/run/PyVirtualEnvReader.kt
@@ -86,10 +86,10 @@ class PyVirtualEnvReader(val virtualEnvSdkPath: String) : EnvironmentUtil.ShellE
 
     return if (activate != null)
       if (File(shellPath).name == "bash") {
-        mutableListOf(shellPath, "--rcfile", activate, "-i")
+        mutableListOf(shellPath, "--rcfile", activate)
       }
       else {
-        mutableListOf(shellPath, "-i", "-c", "source '$activate'")
+        mutableListOf(shellPath, "-c", "source '$activate'")
       }
     else super.getShellProcessCommand()
   }