From 48e7506ca0fe0c4ad8271f4d04c49af41bc96bfc Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Sun, 21 Aug 2016 06:14:55 -0400 Subject: [PATCH 1/3] NetBSD support --- news/netbsd.rst | 13 +++++++++++++ xonsh/aliases.py | 4 ++-- xonsh/platform.py | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 news/netbsd.rst diff --git a/news/netbsd.rst b/news/netbsd.rst new file mode 100644 index 000000000..0bc886fe7 --- /dev/null +++ b/news/netbsd.rst @@ -0,0 +1,13 @@ +**Added:** + +* NetBSD is now supported. + +**Changed:** None + +**Deprecated:** None + +**Removed:** None + +**Fixed:** None + +**Security:** None diff --git a/xonsh/aliases.py b/xonsh/aliases.py index 2024b713b..c1eff7934 100644 --- a/xonsh/aliases.py +++ b/xonsh/aliases.py @@ -14,7 +14,7 @@ from xonsh.environ import locate_binary from xonsh.foreign_shells import foreign_shell_data from xonsh.jobs import jobs, fg, bg, clean_jobs 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_BSD, scandir) from xonsh.proc import foreground from xonsh.replay import replay_main @@ -588,7 +588,7 @@ def make_default_aliases(): default_aliases['sudo'] = sudo elif ON_DARWIN: default_aliases['ls'] = ['ls', '-G'] - elif ON_FREEBSD: + elif ON_BSD: default_aliases['grep'] = ['grep', '--color=auto'] default_aliases['egrep'] = ['egrep', '--color=auto'] default_aliases['fgrep'] = ['fgrep', '--color=auto'] diff --git a/xonsh/platform.py b/xonsh/platform.py index f2f2e1fcc..f86383bb9 100644 --- a/xonsh/platform.py +++ b/xonsh/platform.py @@ -46,6 +46,12 @@ ON_POSIX = LazyBool(lambda: (os.name == 'posix'), globals(), 'ON_POSIX') ON_FREEBSD = LazyBool(lambda: (sys.platform.startswith('freebsd')), globals(), 'ON_FREEBSD') """``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``.""" # From 6880e74bae96d31efcf77d7c55d182699f1edd8e Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Sun, 21 Aug 2016 06:52:20 -0400 Subject: [PATCH 2/3] some updates --- xonsh/aliases.py | 10 +++++++--- xonsh/platform.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xonsh/aliases.py b/xonsh/aliases.py index c1eff7934..d185404f9 100644 --- a/xonsh/aliases.py +++ b/xonsh/aliases.py @@ -14,8 +14,8 @@ from xonsh.environ import locate_binary from xonsh.foreign_shells import foreign_shell_data from xonsh.jobs import jobs, fg, bg, clean_jobs from xonsh.history import history_main -from xonsh.platform import (ON_ANACONDA, ON_DARWIN, ON_WINDOWS, ON_BSD, - scandir) +from xonsh.platform import (ON_ANACONDA, ON_DARWIN, ON_WINDOWS, ON_FREEBSD, + ON_NETBSD, scandir) from xonsh.proc import foreground from xonsh.replay import replay_main from xonsh.timings import timeit_alias @@ -588,11 +588,15 @@ def make_default_aliases(): default_aliases['sudo'] = sudo elif ON_DARWIN: default_aliases['ls'] = ['ls', '-G'] - elif ON_BSD: + elif ON_FREEBSD: default_aliases['grep'] = ['grep', '--color=auto'] default_aliases['egrep'] = ['egrep', '--color=auto'] default_aliases['fgrep'] = ['fgrep', '--color=auto'] 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: default_aliases['grep'] = ['grep', '--color=auto'] default_aliases['egrep'] = ['egrep', '--color=auto'] diff --git a/xonsh/platform.py b/xonsh/platform.py index f86383bb9..11921cc38 100644 --- a/xonsh/platform.py +++ b/xonsh/platform.py @@ -49,7 +49,7 @@ ON_FREEBSD = LazyBool(lambda: (sys.platform.startswith('freebsd')), 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)), +ON_BSD = LazyBool(lambda: ON_FREEBSD or ON_NETBSD, globals(), 'ON_BSD') """``True`` if on a BSD operating system, else ``False``.""" From 577f5661dd59bca11759a3a222bd57768f04cdc9 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Sun, 21 Aug 2016 07:02:16 -0400 Subject: [PATCH 3/3] silly formatting --- xonsh/platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xonsh/platform.py b/xonsh/platform.py index 11921cc38..0430d66c7 100644 --- a/xonsh/platform.py +++ b/xonsh/platform.py @@ -47,7 +47,7 @@ ON_FREEBSD = LazyBool(lambda: (sys.platform.startswith('freebsd')), globals(), 'ON_FREEBSD') """``True`` if on a FreeBSD operating system, else ``False``.""" ON_NETBSD = LazyBool(lambda: (sys.platform.startswith('netbsd')), - globals(), 'ON_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')