From 629056077f3d9c4055821736e9a3479e38c91584 Mon Sep 17 00:00:00 2001
From: Vladimir Iakovlev <nvbn.rm@gmail.com>
Date: Mon, 27 Nov 2017 21:08:46 +0100
Subject: [PATCH] #783: Don't rely on $SHELL for detecting shell

---
 thefuck/shells/__init__.py | 4 +---
 thefuck/shells/bash.py     | 1 +
 thefuck/shells/zsh.py      | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/thefuck/shells/__init__.py b/thefuck/shells/__init__.py
index 0709f4f..9fedf25 100644
--- a/thefuck/shells/__init__.py
+++ b/thefuck/shells/__init__.py
@@ -20,9 +20,7 @@ shells = {'bash': Bash,
 
 
 def _get_shell_from_env():
-    path = os.environ.get('SHELL', '')
-    base_name = os.path.basename(path)
-    name = os.path.splitext(base_name)[0]
+    name = os.environ.get('TF_SHELL')
 
     if name in shells:
         return shells[name]()
diff --git a/thefuck/shells/bash.py b/thefuck/shells/bash.py
index 724dffb..6021fea 100644
--- a/thefuck/shells/bash.py
+++ b/thefuck/shells/bash.py
@@ -13,6 +13,7 @@ class Bash(Generic):
         return '''
             function {name} () {{
                 TF_PYTHONIOENCODING=$PYTHONIOENCODING;
+                export TF_SHELL=bash;
                 export TF_ALIAS={name};
                 export TF_SHELL_ALIASES=$(alias);
                 export TF_HISTORY=$(fc -ln -10);
diff --git a/thefuck/shells/zsh.py b/thefuck/shells/zsh.py
index 90ffdb2..5578cad 100644
--- a/thefuck/shells/zsh.py
+++ b/thefuck/shells/zsh.py
@@ -14,6 +14,7 @@ class Zsh(Generic):
         return '''
             {name} () {{
                 TF_PYTHONIOENCODING=$PYTHONIOENCODING;
+                export TF_SHELL=zsh;
                 export TF_ALIAS={name};
                 export TF_SHELL_ALIASES=$(alias);
                 export TF_HISTORY="$(fc -ln -10)";