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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Klaus Alexander Seistrup 2015-07-31 23:06:22 +02:00
commit c20b80dda3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xonsh/aliases.py
View file

@ -73,7 +73,7 @@ def xexec(args, stdin=None):
def bash_aliases():
"""Computes a dictionary of aliases based on Bash's aliases."""
try:
s = subprocess.check_output(['bash', '-i'],
s = subprocess.check_output(['bash', '-i', '-l'],
input='alias',
stderr=subprocess.PIPE,
universal_newlines=True)

2
xonsh/environ.py
View file

@ -480,7 +480,7 @@ def bash_env():
if hasattr(builtins, '__xonsh_env__'):
currenv = builtins.__xonsh_env__.detype()
try:
s = subprocess.check_output(['bash', '-i'],
s = subprocess.check_output(['bash', '-i', '-l'],
input='env',
env=currenv,
stderr=subprocess.PIPE,