* Refactoring.
This commit is contained in:
parent
f3584ff535
commit
7edd2e2cd2
1 changed files with 55 additions and 37 deletions
|
@ -14,7 +14,7 @@ EOF
|
|||
|
||||
|
||||
# Get the target host.
|
||||
my $sshHost = shift @ARGV;
|
||||
my $sshHost;
|
||||
my @sshOpts = split ' ', ($ENV{"NIX_SSHOPTS"} or "");
|
||||
|
||||
my $sign = 0;
|
||||
|
@ -22,38 +22,54 @@ my $sign = 0;
|
|||
my $compressor = "cat";
|
||||
my $decompressor = "cat";
|
||||
|
||||
my $toMode = 1;
|
||||
|
||||
|
||||
# !!! Copied from nix-pack-closure, should put this in a module.
|
||||
my %storePathsSeen;
|
||||
my @storePaths = ();
|
||||
|
||||
while (@ARGV) {
|
||||
my $storePath = shift @ARGV;
|
||||
if ($storePath eq "--sign") {
|
||||
my $arg = shift @ARGV;
|
||||
if ($arg eq "--sign") {
|
||||
$sign = 1;
|
||||
next;
|
||||
}
|
||||
if ($storePath eq "--gzip") {
|
||||
if ($arg eq "--gzip") {
|
||||
$compressor = "gzip";
|
||||
$decompressor = "gunzip";
|
||||
next;
|
||||
}
|
||||
|
||||
# $storePath might be a symlink to the store, so resolve it.
|
||||
$storePath = (`$binDir/nix-store --query --resolve '$storePath'`
|
||||
if (!defined $sshHost) {
|
||||
$sshHost = $arg;
|
||||
next;
|
||||
}
|
||||
|
||||
push @storePaths, $arg;
|
||||
}
|
||||
|
||||
|
||||
if ($toMode) { # Copy TO the remote machine.
|
||||
|
||||
my @allStorePaths;
|
||||
my %storePathsSeen;
|
||||
|
||||
foreach my $storePath (@storePaths) {
|
||||
# $arg might be a symlink to the store, so resolve it.
|
||||
my $storePath2 = (`$binDir/nix-store --query --resolve '$storePath'`
|
||||
or die "cannot resolve `$storePath'");
|
||||
chomp $storePath;
|
||||
chomp $storePath2;
|
||||
|
||||
# Get the closure of this path.
|
||||
my $pid = open(READ,
|
||||
"$binDir/nix-store --query --requisites '$storePath'|") or die;
|
||||
"$binDir/nix-store --query --requisites '$storePath2'|") or die;
|
||||
|
||||
while (<READ>) {
|
||||
chomp;
|
||||
die "bad: $_" unless /^\//;
|
||||
if (!defined $storePathsSeen{$_}) {
|
||||
push @storePaths, $_;
|
||||
$storePathsSeen{$_} = 1;
|
||||
push @allStorePaths, $_;
|
||||
$storePathsSeen{$_} = 1
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -62,7 +78,7 @@ while (@ARGV) {
|
|||
|
||||
|
||||
# Ask the remote host which paths are invalid.
|
||||
open(READ, "ssh @sshOpts $sshHost nix-store --check-validity --print-invalid @storePaths|");
|
||||
open(READ, "ssh @sshOpts $sshHost nix-store --check-validity --print-invalid @allStorePaths|");
|
||||
my @missing = ();
|
||||
while (<READ>) {
|
||||
chomp;
|
||||
|
@ -79,3 +95,5 @@ if (scalar @missing > 0) {
|
|||
system("nix-store --export $extraOpts @missing | $compressor | ssh @sshOpts $sshHost '$decompressor | nix-store --import'") == 0
|
||||
or die "copying store paths to remote machine failed: $?";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue