Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2017-12-05 23:21:18 +01:00
commit 569ef4fb36
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
krebs/5pkgs/simple/stockholm/default.nix
View File

@ -214,7 +214,9 @@
default_target=root@$system:22/var/src 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_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)"
export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)" export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)"
export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)" 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 */ '' init.proxy = command: opts: pkgs.writeText "init.proxy" /* sh */ ''
if \test "''${using_proxy-}" != true; then 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 qualified_target=$target_user@$target_host:$target_port$target_path
if \test "$force_populate" = true; then if \test "$force_populate" = true; then
echo "$source" | ${pkgs.populate}/bin/populate --force "$qualified_target" echo "$source" | ${pkgs.populate}/bin/populate --force "$qualified_target"