diff --git a/thefuck/shells/bash.py b/thefuck/shells/bash.py index 81a534d5..eaff0120 100644 --- a/thefuck/shells/bash.py +++ b/thefuck/shells/bash.py @@ -15,9 +15,9 @@ class Bash(Generic): # It is VERY important to have the variables declared WITHIN the function return ''' function {name} () {{ + export TF_STATUS=$?; TF_PYTHONIOENCODING=$PYTHONIOENCODING; export TF_SHELL=bash; - export TF_STATUS=$?; export TF_ALIAS={name}; export TF_SHELL_ALIASES=$(alias); export TF_HISTORY=$(fc -ln -10); diff --git a/thefuck/shells/fish.py b/thefuck/shells/fish.py index 19e94162..1500a59e 100644 --- a/thefuck/shells/fish.py +++ b/thefuck/shells/fish.py @@ -57,8 +57,9 @@ class Fish(Generic): alter_history = '' # It is VERY important to have the variables declared WITHIN the alias return ('function {0} -d "Correct your previous console command"\n' + ' env TF_STATUS=$status\n' ' set -l fucked_up_command $history[1]\n' - ' env TF_SHELL=fish TF_ALIAS={0} TF_STATUS=$status PYTHONIOENCODING=utf-8' + ' env TF_SHELL=fish TF_ALIAS={0} PYTHONIOENCODING=utf-8' ' thefuck $fucked_up_command {2} $argv | read -l unfucked_command\n' ' if [ "$unfucked_command" != "" ]\n' ' eval $unfucked_command\n{1}' diff --git a/thefuck/shells/tcsh.py b/thefuck/shells/tcsh.py index ec40e905..03246b9c 100644 --- a/thefuck/shells/tcsh.py +++ b/thefuck/shells/tcsh.py @@ -9,8 +9,8 @@ class Tcsh(Generic): friendly_name = 'Tcsh' def app_alias(self, alias_name): - return ("alias {0} 'setenv TF_SHELL tcsh && setenv TF_ALIAS {0} && " - "setenv TF_STATUS=$status && " + return ("alias {0} 'setenv TF_STATUS=$status && " + "setenv TF_SHELL tcsh && setenv TF_ALIAS {0} && " "set fucked_cmd=`history -h 2 | head -n 1` && " "eval `thefuck ${{fucked_cmd}}`'").format(alias_name) diff --git a/thefuck/shells/zsh.py b/thefuck/shells/zsh.py index c094ab37..8a343734 100644 --- a/thefuck/shells/zsh.py +++ b/thefuck/shells/zsh.py @@ -16,9 +16,9 @@ class Zsh(Generic): # It is VERY important to have the variables declared WITHIN the function return ''' {name} () {{ + export TF_STATUS=$?; TF_PYTHONIOENCODING=$PYTHONIOENCODING; export TF_SHELL=zsh; - export TF_STATUS=$?; export TF_ALIAS={name}; TF_SHELL_ALIASES=$(alias); export TF_SHELL_ALIASES;