diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/krops/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/populate/default.nix | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix index 13de4ce..08e74f7 100644 --- a/pkgs/krops/default.nix +++ b/pkgs/krops/default.nix @@ -20,9 +20,9 @@ in remoteCommand = target: command: exec "build.${target.host}" rec { filename = "${openssh}/bin/ssh"; - argv = [ + argv = lib.flatten [ filename - "-l" target.user + (lib.optionals (target.user != "") ["-l" target.user]) "-p" target.port "-t" target.host diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix index 1367a50..f78aa4a 100644 --- a/pkgs/populate/default.nix +++ b/pkgs/populate/default.nix @@ -162,8 +162,10 @@ let --delete-excluded \ "$source_path" \ ${quote ( - optionalString (!isLocalTarget target) - "${target.user}@${target.host}:" + + optionalString (!isLocalTarget target) ( + (optionalString (target.user != "") "${target.user}@") + + "${target.host}:" + ) + target.path )} \ >&2 @@ -176,13 +178,13 @@ let ${ssh' target} ${quote target.host} ${quote script} ''; - ssh' = target: concatMapStringsSep " " quote [ + ssh' = target: concatMapStringsSep " " quote (flatten [ "${openssh}/bin/ssh" - "-l" target.user + (optionals (target.user != "") ["-l" target.user]) "-o" "ControlPersist=no" "-p" target.port "-T" - ]; + ]); in |