mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Nested shells should not be login (#5247) (#5565)

Browse Source
This commit is contained in:
David Lukes 2020-07-01 18:55:30 +02:00 committed by GitHub
parent 94af525a2c
commit b152dd314d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
notebook/terminal/__init__.py
View File

@ -21,8 +21,13 @@ def initialize(nb_app):
shell = nb_app.terminado_settings.get('shell_command', shell = nb_app.terminado_settings.get('shell_command',
[os.environ.get('SHELL') or default_shell] [os.environ.get('SHELL') or default_shell]
) )
# Enable login mode - to automatically source the /etc/profile script # Enable login mode - to automatically source the /etc/profile
if os.name != 'nt': # script, but only for non-nested shells; for nested shells, it's
# superfluous and may even be harmful (e.g. on macOS, where login
# shells invoke /usr/libexec/path_helper to add entries from
# /etc/paths{,.d} to the PATH, reordering it in the process and
# potentially overriding virtualenvs and other PATH modifications)
if os.name != 'nt' and int(os.environ.get("SHLVL", 0)) < 1:
shell.append('-l') shell.append('-l')
terminal_manager = nb_app.web_app.settings['terminal_manager'] = TerminalManager( terminal_manager = nb_app.web_app.settings['terminal_manager'] = TerminalManager(
shell_command=shell, shell_command=shell,