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 branch 'master' into m

Browse source
This commit is contained in:
Anthony Scopatz 2016-08-21 09:57:18 -04:00
commit 4d393036b0
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
news/netbsd.rst Normal file
View file

@ -0,0 +1,13 @@
**Added:**
* NetBSD is now supported.
**Changed:** None
**Deprecated:** None
**Removed:** None
**Fixed:** None
**Security:** None

6
xonsh/aliases.py
View file

@ -15,7 +15,7 @@ from xonsh.foreign_shells import foreign_shell_data
from xonsh.jobs import jobs, fg, bg, clean_jobs from xonsh.jobs import jobs, fg, bg, clean_jobs
from xonsh.history import history_main from xonsh.history import history_main
from xonsh.platform import (ON_ANACONDA, ON_DARWIN, ON_WINDOWS, ON_FREEBSD, from xonsh.platform import (ON_ANACONDA, ON_DARWIN, ON_WINDOWS, ON_FREEBSD,
scandir) ON_NETBSD, scandir)
from xonsh.proc import foreground from xonsh.proc import foreground
from xonsh.replay import replay_main from xonsh.replay import replay_main
from xonsh.timings import timeit_alias from xonsh.timings import timeit_alias
@ -593,6 +593,10 @@ def make_default_aliases():
default_aliases['egrep'] = ['egrep', '--color=auto'] default_aliases['egrep'] = ['egrep', '--color=auto']
default_aliases['fgrep'] = ['fgrep', '--color=auto'] default_aliases['fgrep'] = ['fgrep', '--color=auto']
default_aliases['ls'] = ['ls', '-G'] default_aliases['ls'] = ['ls', '-G']
elif ON_NETBSD:
default_aliases['grep'] = ['grep', '--color=auto']
default_aliases['egrep'] = ['egrep', '--color=auto']
default_aliases['fgrep'] = ['fgrep', '--color=auto']
else: else:
default_aliases['grep'] = ['grep', '--color=auto'] default_aliases['grep'] = ['grep', '--color=auto']
default_aliases['egrep'] = ['egrep', '--color=auto'] default_aliases['egrep'] = ['egrep', '--color=auto']

6
xonsh/platform.py
View file

@ -46,6 +46,12 @@ ON_POSIX = LazyBool(lambda: (os.name == 'posix'), globals(), 'ON_POSIX')
ON_FREEBSD = LazyBool(lambda: (sys.platform.startswith('freebsd')), ON_FREEBSD = LazyBool(lambda: (sys.platform.startswith('freebsd')),
globals(), 'ON_FREEBSD') globals(), 'ON_FREEBSD')
"""``True`` if on a FreeBSD operating system, else ``False``.""" """``True`` if on a FreeBSD operating system, else ``False``."""
ON_NETBSD = LazyBool(lambda: (sys.platform.startswith('netbsd')),
globals(), 'ON_NETBSD')
"""``True`` if on a NetBSD operating system, else ``False``."""
ON_BSD = LazyBool(lambda: ON_FREEBSD or ON_NETBSD,
globals(), 'ON_BSD')
"""``True`` if on a BSD operating system, else ``False``."""
# #