From f48a482a186c863bc424e49aa29af4a00a0f38d9 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Sat, 21 Sep 2019 07:38:14 -0400
Subject: [PATCH] better state

---
 bake/bakefile.py |  2 +-
 bake/cli.py      | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bake/bakefile.py b/bake/bakefile.py
index 2bc39db..c5c65da 100644
--- a/bake/bakefile.py
+++ b/bake/bakefile.py
@@ -553,7 +553,7 @@ class TaskScript(BaseAction):
         sed_magic = (
             "2>&1  | sed >&2 's/^/ |  /' && exit \"${PIPESTATUS[0]}\""
             if not (interactive or silent)
-            else "\b"
+            else "2>&1"
         )
         script = f"t=$(mktemp) && bake --source {self.name} > $t && chmod +x $t && $t {args} {sed_magic}; rm -fr $t"
 
diff --git a/bake/cli.py b/bake/cli.py
index 8f348c9..25903ba 100644
--- a/bake/cli.py
+++ b/bake/cli.py
@@ -367,8 +367,10 @@ def entrypoint(
                     skips.append(edge.do_skip)
 
             if not all(skips or [False]):
+                # TODO: fully implement this?
                 if "@" in f"{task}":
                     silent = True
+
                 if not silent:
                     click.echo(
                         click.style(" + ", fg="white")
@@ -376,24 +378,25 @@ def entrypoint(
                         + click.style(":", fg="white"),
                         err=True,
                     )
-                usually_bash = task.execute(
+                usually_bash_task = task.execute(
                     yes=yes, debug=debug, silent=silent, interactive=interactive
                 )
 
                 if not _continue:
-                    if hasattr(usually_bash, "ok"):
+                    if hasattr(usually_bash_task, "ok"):
 
-                        if usually_bash.return_code > 0:
+                        if usually_bash_task.return_code > 0:
                             if not silent:
                                 click.echo(
                                     click.style(f"Task {task} failed!", fg="red"),
                                     err=True,
                                 )
-                            sys.exit(usually_bash.return_code)
+                            sys.exit(usually_bash_task.return_code)
 
-                    elif isinstance(usually_bash, tuple):
+                    # This happens when it's a task filter.
+                    elif isinstance(usually_bash_task, tuple):
                         key, value = (
-                            usually_bash
+                            usually_bash_task
                         )  # But, in this instance, clearly isn't.
             else:
                 click.echo(