summaryrefslogtreecommitdiffstats
path: root/krebs/v2
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-02 03:20:29 +0100
committertv <tv@krebsco.de>2016-02-02 03:20:29 +0100
commit8e219cd0a2446e8f141e0f2403413a9bd3f0b061 (patch)
treeb52e758e0cea5364596faacba1e07878a0aa40ba /krebs/v2
parentb849e3525edfe884a2e004e6497aad9995c093bd (diff)
Makefile,krebs/v2: verbosity++
Diffstat (limited to 'krebs/v2')
-rw-r--r--krebs/v2/default.nix28
1 files changed, 23 insertions, 5 deletions
diff --git a/krebs/v2/default.nix b/krebs/v2/default.nix
index 7eb60103f..78e990d1c 100644
--- a/krebs/v2/default.nix
+++ b/krebs/v2/default.nix
@@ -15,26 +15,34 @@ let
populate = ''
#! /bin/sh
- set -efu
+ set -eu
+
+ verbose() {
+ printf '+' >&2
+ printf ' %q' "$@" >&2
+ printf '\n'
+ "$@"
+ }
echo ${shell.escape git-script} \
| ssh ${shell.escape "${target-user}@${target-host}"} -T
- tmpdir=$(mktemp -dt stockholm.XXXXXXXX)
+ unset tmpdir
trap '
- set +f
rm "$tmpdir"/*
rmdir "$tmpdir"
trap - EXIT INT QUIT
' EXIT INT QUIT
+ tmpdir=$(mktemp -dt stockholm.XXXXXXXX)
chmod 0755 "$tmpdir"
+
${concatStringsSep "\n"
(mapAttrsToList
(name: spec: let dst = removePrefix "symlink:" (get-url spec); in
- "ln -s ${shell.escape dst} $tmpdir/${shell.escape name}")
+ "verbose ln -s ${shell.escape dst} $tmpdir/${shell.escape name}")
symlink-specs)}
- proot \
+ verbose proot \
-b $tmpdir:${shell.escape target-path} \
${concatStringsSep " \\\n "
(mapAttrsToList
@@ -77,6 +85,15 @@ let
filterAttrs (_: spec: has-schema "symlink" (get-url spec)) source;
git-script = ''
+ #! /bin/sh
+ set -efu
+
+ verbose() {
+ printf '+' >&2
+ printf ' %q' "$@" >&2
+ printf '\n'
+ }
+
fetch_git() {(
dst_dir=$1
src_url=$2
@@ -109,6 +126,7 @@ let
${concatStringsSep "\n"
(mapAttrsToList
(name: spec: toString (map shell.escape [
+ "verbose"
"fetch_git"
"${target-path}/${name}"
spec.url