From 6ab0c5ed85a58330e9a7b074ec3150ca19f8f39d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sat, 21 Sep 2019 07:55:01 -0400 Subject: [PATCH] fixes --- bake/bakefile.py | 8 ++++---- bake/cli.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bake/bakefile.py b/bake/bakefile.py index c5c65da..294c9a4 100644 --- a/bake/bakefile.py +++ b/bake/bakefile.py @@ -551,11 +551,11 @@ class TaskScript(BaseAction): args = args if args else "\b" sed_magic = ( - "2>&1 | sed >&2 's/^/ | /' && exit \"${PIPESTATUS[0]}\"" - if not (interactive or silent) - else "2>&1" + "| sed >&2 's/^/ | /' && exit \"${PIPESTATUS[0]}\"" + if not silent + else "| sed >&2 's/^//' && exit \"${PIPESTATUS[0]}\"" ) - script = f"t=$(mktemp) && bake --source {self.name} > $t && chmod +x $t && $t {args} {sed_magic}; rm -fr $t" + script = f"t=$(mktemp) && bake --source {self.name} > $t && chmod +x $t && $t {args} 2>&1 {sed_magic}; rm -fr $t" if debug: click.echo(f" {click.style('$', fg='green')} {script}", err=True) diff --git a/bake/cli.py b/bake/cli.py index 25903ba..f75f6ea 100644 --- a/bake/cli.py +++ b/bake/cli.py @@ -348,7 +348,6 @@ def entrypoint( sys.exit(0) if task: - try: task = bakefile[task] except KeyError: