mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-05 17:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #542 from adqm/home_replace

Browse source 
modify twiddle replacement to happen only at the start of the path
This commit is contained in:
Anthony Scopatz 2015-11-29 18:03:21 -05:00
commit 578f05845b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xonsh/environ.py
View file

@ -528,14 +528,18 @@ def _replace_home(x):
if ON_WINDOWS:
home = (builtins.__xonsh_env__['HOMEDRIVE'] +
builtins.__xonsh_env__['HOMEPATH'][0])
cwd = x.replace(home, '~')
if x.startswith(home):
x = x.replace(home, '~', 1)
if builtins.__xonsh_env__.get('FORCE_POSIX_PATHS'):
cwd = cwd.replace(os.sep, os.altsep)
x = x.replace(os.sep, os.altsep)
return cwd
return x
else:
return x.replace(builtins.__xonsh_env__['HOME'], '~')
home = builtins.__xonsh_env__['HOME']
if x.startswith(home):
x = x.replace(home, '~', 1)
return x
_replace_home_cwd = lambda: _replace_home(builtins.__xonsh_env__['PWD'])