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

Enable xonsh-cat for invocation directly from OS shell.

Browse source
This commit is contained in:
Bob Hyman 2020-08-08 02:33:07 -04:00
parent f321ebf041
commit 91f1962d28
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
news/is_3661.rst
View file

@ -21,6 +21,8 @@
When multiple interpreters are in PATH, 'py' will choose the first one (usually in the virtual environment), When multiple interpreters are in PATH, 'py' will choose the first one (usually in the virtual environment),
but 'py -3' finds the system-wide one, apparently by design. but 'py -3' finds the system-wide one, apparently by design.
* For xonsh-cat, avoid parsing and processing first (0'th) argument when invoked directly from OS shell.
**Security:** **Security:**

2
setup.py
View file

@ -379,7 +379,7 @@ def main():
"pytest11": ["xonsh = xonsh.pytest_plugin"], "pytest11": ["xonsh = xonsh.pytest_plugin"],
"console_scripts": [ "console_scripts": [
"xonsh = xonsh.main:main", "xonsh = xonsh.main:main",
"xonsh-cat = xonsh.xorutils.cat", "xonsh-cat = xonsh.xoreutils.cat:cat_main",
], ],
} }
skw["cmdclass"]["develop"] = xdevelop skw["cmdclass"]["develop"] = xdevelop

2
xonsh/xoreutils/cat.py
View file

@ -161,7 +161,7 @@ def cat_main(args=None):
from xonsh.main import setup from xonsh.main import setup
setup() setup()
args = sys.argv if args is None else args args = sys.argv[1:] if args is None else args
cat(args, sys.stdin, sys.stdout, sys.stderr) cat(args, sys.stdin, sys.stdout, sys.stderr)