kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update activate_virtualenv for Fish 3.0+

Browse Source 
Fish 3 removes the `.` command in favour of `source`, so we need to
adapt.

See fish-shell/fish-shell#4294 and
https://github.com/pypa/pipenv/pull/1388#issuecomment-367353694
This commit is contained in:
Tzu-ping Chung
2018-02-22 00:15:42 +08:00
parent 4ffa057ee2
commit dac2f6601d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/core.py
+4 -2
View File
@@ -1180,12 +1180,14 @@ def do_lock(verbose=False, system=False, clear=False, pre=False):
def activate_virtualenv(source=True):
"""Returns the string to activate a virtualenv."""
# Suffix for other shells.
# Suffix and source command for other shells.
suffix = ''
command = '.' if source else ''
# Support for fish shell.
if PIPENV_SHELL and 'fish' in PIPENV_SHELL:
suffix = '.fish'
command = 'source'
# Support for csh shell.
if PIPENV_SHELL and 'csh' in PIPENV_SHELL:
@@ -1196,7 +1198,7 @@ def activate_virtualenv(source=True):
venv_location = project.virtualenv_location.replace(' ', r'\ ')
if source:
return '. {0}/bin/activate{1}'.format(venv_location, suffix)
return '{2} {0}/bin/activate{1}'.format(venv_location, suffix, command)
else:
return '{0}/bin/activate'.format(venv_location)