MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-31 07:04:12 +00:00
Code Issues Releases Wiki Activity

#783: Don't rely on $SHELL for detecting shell

Browse Source
This commit is contained in:
Vladimir Iakovlev
2017-11-27 21:08:46 +01:00
parent 4780027d63
commit 629056077f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
thefuck/shells/__init__.py
View File

@@ -20,9 +20,7 @@ shells = {'bash': Bash,
def _get_shell_from_env(): def _get_shell_from_env():
path = os.environ.get('SHELL', '') name = os.environ.get('TF_SHELL')
base_name = os.path.basename(path)
name = os.path.splitext(base_name)[0]
if name in shells: if name in shells:
return shells[name]() return shells[name]()

1
thefuck/shells/bash.py
View File

@@ -13,6 +13,7 @@ class Bash(Generic):
return ''' return '''
function {name} () {{ function {name} () {{
TF_PYTHONIOENCODING=$PYTHONIOENCODING; TF_PYTHONIOENCODING=$PYTHONIOENCODING;
export TF_SHELL=bash;
export TF_ALIAS={name}; export TF_ALIAS={name};
export TF_SHELL_ALIASES=$(alias); export TF_SHELL_ALIASES=$(alias);
export TF_HISTORY=$(fc -ln -10); export TF_HISTORY=$(fc -ln -10);

1
thefuck/shells/zsh.py
View File

@@ -14,6 +14,7 @@ class Zsh(Generic):
return ''' return '''
{name} () {{ {name} () {{
TF_PYTHONIOENCODING=$PYTHONIOENCODING; TF_PYTHONIOENCODING=$PYTHONIOENCODING;
export TF_SHELL=zsh;
export TF_ALIAS={name}; export TF_ALIAS={name};
export TF_SHELL_ALIASES=$(alias); export TF_SHELL_ALIASES=$(alias);
export TF_HISTORY="$(fc -ln -10)"; export TF_HISTORY="$(fc -ln -10)";