diff options
author | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
commit | 020fcc22000ce35337a765bfa37f4178fbbff68c (patch) | |
tree | 8485531b5285b4dce6e9b9abecba4ccad5b9b46a /krebs/3modules/build.nix | |
parent | 2924afb8a2cb7d734b56a4a8934737129a20154c (diff) | |
parent | a2b8eb75506fa27bc3d44f6a33d860ce7d3470e0 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/build.nix')
-rw-r--r-- | krebs/3modules/build.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix index b8ea34ae..d4c6b08d 100644 --- a/krebs/3modules/build.nix +++ b/krebs/3modules/build.nix @@ -41,6 +41,8 @@ let #! /bin/sh set -eu + ssh=''${ssh-ssh} + verbose() { printf '%s%s\n' "$PS5$(printf ' %q' "$@")" >&2 "$@" @@ -48,7 +50,7 @@ let { printf 'PS5=%q%q\n' @ "$PS5" echo ${shell.escape git-script} - } | verbose ssh -p ${shell.escape target-port} \ + } | verbose $ssh -p ${shell.escape target-port} \ ${shell.escape "${target-user}@${target-host}"} -T unset tmpdir @@ -77,7 +79,7 @@ let ) (attrNames source-by-method.file)} \ --delete \ -vFrlptD \ - -e ${shell.escape "ssh -p ${target-port}"} \ + -e "$ssh -p ${shell.escape target-port}" \ ${shell.escape target-path}/ \ ${shell.escape "${target-user}@${target-host}:${target-path}"} ''; @@ -114,7 +116,7 @@ let if ! test "$(git log --format=%H -1)" = "$hash"; then git fetch origin git checkout "$hash" -- "$dst_dir" - git checkout "$hash" + git checkout -f "$hash" fi git clean -dxf |