diff options
| author | lassulus <lassulus@lassul.us> | 2017-12-05 23:21:18 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-12-05 23:21:18 +0100 |
| commit | 569ef4fb369b94799c8ef69cb4e6f9cd8a2cdaeb (patch) | |
| tree | 30cbf16e19cbc4e3e4cc26963e3a6873be257d0a /krebs/5pkgs | |
| parent | 71db1de0c8c7ed2c69e1bc91c0c0f82d6ecf61e2 (diff) | |
| parent | 3fb25717c5c7dbe69f56cea4c529cac398789c2b (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/simple/stockholm/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/krebs/5pkgs/simple/stockholm/default.nix b/krebs/5pkgs/simple/stockholm/default.nix index 3d41c49c2..3d9cea64d 100644 --- a/krebs/5pkgs/simple/stockholm/default.nix +++ b/krebs/5pkgs/simple/stockholm/default.nix @@ -214,7 +214,9 @@ default_target=root@$system:22/var/src - export target_object="$(parse-target "$target" -d "$default_target")" + export target_object="$( + ${cmds.parse-target} "$target" -d "$default_target" + )" export target_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)" export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)" export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)" @@ -225,7 +227,7 @@ init.proxy = command: opts: pkgs.writeText "init.proxy" /* sh */ '' if \test "''${using_proxy-}" != true; then - source=$(get-source "$source_file") + source=$(${cmds.get-source} "$source_file") qualified_target=$target_user@$target_host:$target_port$target_path if \test "$force_populate" = true; then echo "$source" | ${pkgs.populate}/bin/populate --force "$qualified_target" |