From db98f0d1548643e336e85571b10e4d6bef2de339 Mon Sep 17 00:00:00 2001 From: a Date: Sun, 18 Oct 2020 23:42:29 +0300 Subject: [PATCH] 0.1.2 --- setup.py | 4 ++-- xontrib/{sh.xsh => sh.py} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename xontrib/{sh.xsh => sh.py} (90%) diff --git a/setup.py b/setup.py index 2cad738..07d2a6d 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='xontrib-sh', - version='0.1.1', + version='0.1.2', license='BSD', author='anki', author_email='author@example.com', @@ -19,7 +19,7 @@ python_requires='>=3.6', packages=['xontrib'], package_dir={'xontrib': 'xontrib'}, - package_data={'xontrib': ['*.xsh']}, + package_data={'xontrib': ['*.py']}, platforms='any', url='https://github.com/anki-code/xontrib-sh', project_urls={ diff --git a/xontrib/sh.xsh b/xontrib/sh.py similarity index 90% rename from xontrib/sh.xsh rename to xontrib/sh.py index 2092d67..6b540ef 100644 --- a/xontrib/sh.xsh +++ b/xontrib/sh.py @@ -19,7 +19,7 @@ def onepath(cmd, **kw): first_compatible_shell = None check_output_all = '' for s in _installed_shells: - check_output = $(@(s) -nc @(shell_cmd) 2>&1).strip() + check_output = __xonsh__.subproc_captured_stdout([s, '-nc', shell_cmd, '2>&1']).strip() if check_output == '': first_compatible_shell = s break