diff options
| author | tv <tv@krebsco.de> | 2016-02-18 01:15:58 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-18 01:15:58 +0100 |
| commit | 8c264139b294cbbea27a042263a4b76991910f02 (patch) | |
| tree | 2e628f6e656ead838a07c4ce107a8492a0d68af2 | |
| parent | 7f1abe50ce0989d96c3d275a4d0481962848714f (diff) | |
krebs.build: use $F5 to prefix verbose commands
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | krebs/3modules/build.nix | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -51,7 +51,7 @@ evaluate = \ execute = \ result=$$($(call evaluate,-A config.krebs.build.$(1) --json)) && \ script=$$(echo "$$result" | jq -r .) && \ - echo "$$script" | sh + echo "$$script" | PS5=% sh # usage: make deploy system=foo [target_host=bar] deploy: ssh ?= ssh diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix index c700fbc56..b8ea34ae2 100644 --- a/krebs/3modules/build.nix +++ b/krebs/3modules/build.nix @@ -42,12 +42,13 @@ let set -eu verbose() { - printf '+%s\n' "$(printf ' %q' "$@")" >&2 + printf '%s%s\n' "$PS5$(printf ' %q' "$@")" >&2 "$@" } - echo ${shell.escape git-script} \ - | ssh -p ${shell.escape target-port} \ + { printf 'PS5=%q%q\n' @ "$PS5" + echo ${shell.escape git-script} + } | verbose ssh -p ${shell.escape target-port} \ ${shell.escape "${target-user}@${target-host}"} -T unset tmpdir @@ -86,7 +87,7 @@ let set -efu verbose() { - printf '+%s\n' "$(printf ' %q' "$@")" >&2 + printf '%s%s\n' "$PS5$(printf ' %q' "$@")" >&2 "$@" } |