diff options
| author | Michael Feist <90416568+Maxxus220@users.noreply.github.com> | 2024-04-14 10:02:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 17:02:00 +0200 |
| commit | de5b7f041a8c88ecf912b3be3b32d70f76518348 (patch) | |
| tree | 7ac11238abf55cfa2c7b639d921ccbec4fe5446b | |
| parent | 8970359f085ef80eb05085ba33dde623ffb41c82 (diff) | |
fix(xonsh): remove `| cat` workaround from xonsh init (#5113)
| -rw-r--r-- | src/init/starship.xsh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/init/starship.xsh b/src/init/starship.xsh index a14ad9968..ee69e3ef2 100644 --- a/src/init/starship.xsh +++ b/src/init/starship.xsh @@ -8,8 +8,7 @@ def starship_prompt(): # but we can't use that function because of https://gitter.im/xonsh/xonsh?at=60e8832d82dd9050f5e0c96a jobs = sum(1 for job in __xonsh__.all_jobs.values() if job['obj'] and job['obj'].poll() is None) duration = round((last_cmd.ts[1] - last_cmd.ts[0]) * 1000) if last_cmd else 0 - # The `| cat` is a workaround for https://github.com/xonsh/xonsh/issues/3786. See https://github.com/starship/starship/pull/2807#discussion_r667316323. - return $(::STARSHIP:: prompt --status=@(status) --jobs=@(jobs) --cmd-duration=@(duration) | cat) + return $(::STARSHIP:: prompt --status=@(status) --jobs=@(jobs) --cmd-duration=@(duration)) def starship_rprompt(): last_cmd = __xonsh__.history[-1] if __xonsh__.history else None @@ -18,8 +17,7 @@ def starship_rprompt(): # but we can't use that function because of https://gitter.im/xonsh/xonsh?at=60e8832d82dd9050f5e0c96a jobs = sum(1 for job in __xonsh__.all_jobs.values() if job['obj'] and job['obj'].poll() is None) duration = round((last_cmd.ts[1] - last_cmd.ts[0]) * 1000) if last_cmd else 0 - # The `| cat` is a workaround for https://github.com/xonsh/xonsh/issues/3786. See https://github.com/starship/starship/pull/2807#discussion_r667316323. - return $(::STARSHIP:: prompt --status=@(status) --jobs=@(jobs) --cmd-duration=@(duration) --right | cat) + return $(::STARSHIP:: prompt --status=@(status) --jobs=@(jobs) --cmd-duration=@(duration) --right) $PROMPT = starship_prompt |