From ac9a6e4b60578a7e022a30a89d411bc219b2d20f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sat, 21 Sep 2019 07:58:58 -0400 Subject: [PATCH] fixes --- bake/bakefile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bake/bakefile.py b/bake/bakefile.py index 294c9a4..3e160b4 100644 --- a/bake/bakefile.py +++ b/bake/bakefile.py @@ -549,13 +549,13 @@ class TaskScript(BaseAction): args = " ".join([shlex_quote(a) for a in self.bashfile.args]) args = args if args else "\b" + sed_magic = "sed >&2 's/^/ | /'" if not silent else "sed >&2 's/^//'" - sed_magic = ( - "| sed >&2 's/^/ | /' && exit \"${PIPESTATUS[0]}\"" - if not silent - else "| sed >&2 's/^//' && exit \"${PIPESTATUS[0]}\"" + script = ( + f"t=$(mktemp) && bake --source {self.name} " + f"> $t && chmod +x $t && $t {args} 2>&1 | " + f"{sed_magic}" + ' && exit "${PIPESTATUS[0]}"; 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)