better state

This commit is contained in:
2019-09-21 07:38:14 -04:00
parent 79e12115c6
commit f48a482a18
2 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -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"
+9 -6
View File
@@ -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(