diff options
author | tv <tv@krebsco.de> | 2017-07-08 14:58:09 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-07-08 15:01:48 +0200 |
commit | fc3f5d3d56a299b7b46c1a42d3fec57c536a5917 (patch) | |
tree | b3c22e29127fe2123c667067e949505b26d4daa3 | |
parent | 1fb964e8412106a5d9b764e86a995aabbcd060c3 (diff) |
shell: don't populate when source doesn't evaluate
-rw-r--r-- | shell.nix | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -85,18 +85,19 @@ let }; populate = pkgs.writeDash "init.env.populate" '' set -efu - ${pkgs.nix}/bin/nix-instantiate \ + _source=$(${pkgs.nix}/bin/nix-instantiate \ --eval \ --json \ --readonly-mode \ --show-trace \ --strict \ -I nixos-config="$config" \ - -E 'with import <stockholm>; config.krebs.build.source' \ - | + -E 'with import <stockholm>; config.krebs.build.source') + echo $_source | ${pkgs.populate}/bin/populate \ "$target_user@$target_host:$target_port$target_path" \ >&2 + unset _source ''; proxy = pkgs.writeDash "init.env.proxy" '' set -efu |