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

Merge branch 'admiralobvious-cd_oldpwd'

Browse source
This commit is contained in:
Anthony Scopatz 2015-03-18 19:44:59 -05:00
commit 831e0c07b5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xonsh/aliases.py
View file

@ -13,18 +13,23 @@ def cd(args, stdin=None):
If no directory is specified (i.e. if `args` is None) then this If no directory is specified (i.e. if `args` is None) then this
changes to the current user's home directory. changes to the current user's home directory.
""" """
env = builtins.__xonsh_env__
cur_oldpwd = env.get('OLDPWD') or os.getcwd()
if len(args) == 0: if len(args) == 0:
d = os.path.expanduser('~') d = os.path.expanduser('~')
elif len(args) == 1: elif len(args) == 1:
d = args[0] d = args[0]
if d == '-':
d = cur_oldpwd
else: else:
return '', 'cd takes 0 or 1 arguments, not {0}\n'.format(len(args)) return '', 'cd takes 0 or 1 arguments, not {0}\n'.format(len(args))
if not os.path.exists(d): if not os.path.exists(d):
return '', 'cd: no such file or directory: {0}\n'.format(d) return '', 'cd: no such file or directory: {0}\n'.format(d)
if not os.path.isdir(d): if not os.path.isdir(d):
return '', 'cd: {0} is not a directory\n'.format(d) return '', 'cd: {0} is not a directory\n'.format(d)
env['OLDPWD'] = os.getcwd()
os.chdir(d) os.chdir(d)
builtins.__xonsh_env__['PWD'] = os.getcwd() env['PWD'] = os.getcwd()
return None, None return None, None
def exit(args, stdin=None): def exit(args, stdin=None):