Unset auxiliary env variables
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 25 Nov 2016 14:38:35 +0000 (15:38 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 25 Nov 2016 14:40:35 +0000 (15:40 +0100)
plugins/terminal/resources/.zshrc
plugins/terminal/resources/fish/config.fish
plugins/terminal/resources/jediterm-bash.in

index 72c38b82dc24d4b4b8886a6bf9cd1dd1e7ccdcf5..c47d6a34a83765d89ea7fe5b7e626b3b8f917174 100644 (file)
@@ -7,6 +7,7 @@ bindkey '^[^[[D' backward-word
 if [ -n "$JEDITERM_USER_RCFILE" ]
 then
   source $JEDITERM_USER_RCFILE
 if [ -n "$JEDITERM_USER_RCFILE" ]
 then
   source $JEDITERM_USER_RCFILE
+  unset JEDITERM_USER_RCFILE
 fi
 
 if [ -f "$HOME/.zshrc" ]; then
 fi
 
 if [ -f "$HOME/.zshrc" ]; then
@@ -16,4 +17,5 @@ fi
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE
+  unset JEDITERM_SOURCE
 fi
\ No newline at end of file
 fi
\ No newline at end of file
index 9b265afc47935ff6351ebfdb0d3ad3ba4f311a11..ae0e041048fa07119cee8d6548d2aa642d12a0e5 100644 (file)
@@ -4,8 +4,10 @@ end
 
 if test -n "$JEDITERM_USER_RCFILE"
   . $JEDITERM_USER_RCFILE
 
 if test -n "$JEDITERM_USER_RCFILE"
   . $JEDITERM_USER_RCFILE
+  set -e JEDITERM_USER_RCFILE
 end
 
 if test -n "$JEDITERM_SOURCE"
   . $JEDITERM_SOURCE
 end
 
 if test -n "$JEDITERM_SOURCE"
   . $JEDITERM_SOURCE
+  set -e JEDITERM_SOURCE
 end
\ No newline at end of file
 end
\ No newline at end of file
index 74dd6fdff375a9141b0a5ab546b7ead0d663d61e..cc1cdbc8a7ce08dc90eb70c053c7b0c82ebcea46 100644 (file)
@@ -33,6 +33,7 @@ function load_interactive_configs {
 
 if [ -n $LOGIN_SHELL ]; then
   load_login_configs
 
 if [ -n $LOGIN_SHELL ]; then
   load_login_configs
+  unset LOGIN_SHELL
 fi
 
 load_interactive_configs
 fi
 
 load_interactive_configs
@@ -56,9 +57,11 @@ trap "generate_command_executed_sequence" DEBUG
 if [ -n "$JEDITERM_USER_RCFILE" ]
 then
   source $JEDITERM_USER_RCFILE
 if [ -n "$JEDITERM_USER_RCFILE" ]
 then
   source $JEDITERM_USER_RCFILE
+  unset JEDITERM_USER_RCFILE
 fi
 
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE
 fi
 
 if [ -n "$JEDITERM_SOURCE" ]
 then
   source $JEDITERM_SOURCE
+  unset JEDITERM_SOURCE
 fi
 fi