Merge pull request #3379 from dhirschfeld/patch-1

Use powershell on Windows
jupyter · Feb 27, 2018 · 7ee844f · 7ee844f
2 parents 2aac713 + ce602fc
commit 7ee844f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/notebook/terminal/__init__.py b/notebook/terminal/__init__.py
@@ -14,9 +14,10 @@
 from . import api_handlers
 
 def initialize(webapp, notebook_dir, connection_url, settings):
-    default_shell = which('sh')
-    if not default_shell and os.name == 'nt':
+    if os.name == 'nt':
         default_shell = 'powershell.exe'
+    else:
+        default_shell = which('sh')
     shell = settings.get('shell_command',
         [os.environ.get('SHELL') or default_shell]
     )