From 8c264139b294cbbea27a042263a4b76991910f02 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 18 Feb 2016 01:15:58 +0100
Subject: krebs.build: use $F5 to prefix verbose commands

---
 krebs/3modules/build.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'krebs/3modules/build.nix')

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
             "$@"
           }
 
-- 
cgit v1.2.3