Fix user rcfile handling (IDEA-163064)

diff --git a/plugins/terminal/resources/jediterm-bash.in b/plugins/terminal/resources/jediterm-bash.in
index de4bacd3f69124aeb61478c4f3956b571c8ccb19..84f9a799296b744919aadf064637168b04717522 100644 (file)
--- a/plugins/terminal/resources/jediterm-bash.in
+++ b/plugins/terminal/resources/jediterm-bash.in
@@ -53,6 +53,11 @@ export -f generate_command_executed_sequence
 #generate escape sequence after command is executed to notify jediterm emulator
 trap "generate_command_executed_sequence" DEBUG
 
+if [ -n "$JEDITERM_USER_RCFILE" ]
+then
+  source $JEDITERM_USER_RCFILE
+fi
+
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index a417ffe7ba802cc3b41a67ede513dcbdac43c5a6..e2a5119c5dedaa75dcd3b586c604f0a3ae8267e4 100644 (file)
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -25,6 +25,7 @@ import com.intellij.execution.process.ProcessWaitFor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.concurrency.AppExecutorUtil;
@@ -221,7 +222,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
     if (idx >= 0) {
       command.remove(idx);
       if (idx < command.size()) {
-        envs.put("JEDITERM_SOURCE", command.get(idx));
+        envs.put("JEDITERM_USER_RCFILE", FileUtil.expandUserHome(command.get(idx)));
         command.remove(idx);
       }
     }