mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

denv'd which

Browse source
This commit is contained in:
Anthony Scopatz 2016-05-13 18:32:36 -04:00
parent 4efd129814
commit 71fa298b8f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xonsh/aliases.py
View file

@ -330,14 +330,15 @@ def bang_bang(args, stdin=None):
@lru_cache(1)
def which_version():
"""Returns output from system `which -v`"""
denv = __xonsh_env__.detype()
try:
_ver = subprocess.check_output(['which', '-v'],
_ver = subprocess.check_output(['which', '-v'], env=denv,
stderr=subprocess.PIPE).decode('UTF-8')
except subprocess.CalledProcessError:
_ver = '<no version number available on your OS>'
except FileNotFoundError:
_ver = "<'which' binary not found>"
return _ver
class AWitchAWitch(Action):
@ -374,12 +375,13 @@ def which(args, stdin=None):
pargs = parser.parse_args(args)
#skip alias check if user asks to skip
denv = __xonsh_env__.detype()
if (pargs.arg in builtins.aliases and not pargs.skip):
match = pargs.arg
print('{} -> {}'.format(match, builtins.aliases[match]))
if pargs.all:
try:
subprocess.check_call(['which'] + args,
subprocess.check_call(['which'] + args, env=denv,
stderr=subprocess.PIPE)
except subprocess.CalledProcessError:
pass
@ -387,7 +389,7 @@ def which(args, stdin=None):
print("'which' binary not found")
else:
try:
subprocess.check_call(['which'] + args,
subprocess.check_call(['which'] + args, env=denv,
stderr=subprocess.PIPE)
except subprocess.CalledProcessError:
raise XonshError('{} not in {} or xonsh.builtins.aliases'