From c673f4f8519193c6af9d639abb8661afa61bdd7a Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 25 Nov 2016 15:38:35 +0100
Subject: [PATCH] Unset auxiliary env variables

---
 plugins/terminal/resources/.zshrc           | 2 ++
 plugins/terminal/resources/fish/config.fish | 2 ++
 plugins/terminal/resources/jediterm-bash.in | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/plugins/terminal/resources/.zshrc b/plugins/terminal/resources/.zshrc
index 72c38b82dc24..c47d6a34a837 100644
--- a/plugins/terminal/resources/.zshrc
+++ b/plugins/terminal/resources/.zshrc
@@ -7,6 +7,7 @@ bindkey '^[^[[D' backward-word
 if [ -n "$JEDITERM_USER_RCFILE" ]
 then
   source $JEDITERM_USER_RCFILE
+  unset JEDITERM_USER_RCFILE
 fi
 
 if [ -f "$HOME/.zshrc" ]; then
@@ -16,4 +17,5 @@ fi
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE
+  unset JEDITERM_SOURCE
 fi
\ No newline at end of file
diff --git a/plugins/terminal/resources/fish/config.fish b/plugins/terminal/resources/fish/config.fish
index 9b265afc4793..ae0e041048fa 100644
--- a/plugins/terminal/resources/fish/config.fish
+++ b/plugins/terminal/resources/fish/config.fish
@@ -4,8 +4,10 @@ end
 
 if test -n "$JEDITERM_USER_RCFILE"
   . $JEDITERM_USER_RCFILE
+  set -e JEDITERM_USER_RCFILE
 end
 
 if test -n "$JEDITERM_SOURCE"
   . $JEDITERM_SOURCE
+  set -e JEDITERM_SOURCE
 end
\ No newline at end of file
diff --git a/plugins/terminal/resources/jediterm-bash.in b/plugins/terminal/resources/jediterm-bash.in
index 74dd6fdff375..cc1cdbc8a7ce 100644
--- a/plugins/terminal/resources/jediterm-bash.in
+++ b/plugins/terminal/resources/jediterm-bash.in
@@ -33,6 +33,7 @@ function load_interactive_configs {
 
 if [ -n $LOGIN_SHELL ]; then
   load_login_configs
+  unset LOGIN_SHELL
 fi
 
 load_interactive_configs
@@ -56,9 +57,11 @@ trap "generate_command_executed_sequence" DEBUG
 if [ -n "$JEDITERM_USER_RCFILE" ]
 then
   source $JEDITERM_USER_RCFILE
+  unset JEDITERM_USER_RCFILE
 fi
 
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE
+  unset JEDITERM_SOURCE
 fi
-- 
2.32.0