* Synchronous nix-pull' with nix-push'.

* Use curl instead of wget.
This commit is contained in:
Eelco Dolstra 2004-01-14 14:20:33 +00:00
parent 16f9b133ec
commit 9a404e45c9
2 changed files with 2 additions and 2 deletions

View file

@ -64,7 +64,7 @@ $fullexpr .= "]";
# Instantiate store expressions from the Nix expressions we created above. # Instantiate store expressions from the Nix expressions we created above.
print STDERR "instantiating Nix expression...\n"; print STDERR "instantiating store expressions...\n";
my $pid = open2(\*READ, \*WRITE, "nix-instantiate -") or die "cannot run nix-instantiate"; my $pid = open2(\*READ, \*WRITE, "nix-instantiate -") or die "cannot run nix-instantiate";
print WRITE $fullexpr; print WRITE $fullexpr;

View file

@ -159,7 +159,7 @@ foreach my $nararchive (@nararchives) {
if (system("$curl --head $archives_get_url/$basename > /dev/null") != 0) { if (system("$curl --head $archives_get_url/$basename > /dev/null") != 0) {
print STDERR " $nararchive\n"; print STDERR " $nararchive\n";
system("$curl --show-error --upload-file " . system("$curl --show-error --upload-file " .
"'$nararchive' '$archives_put_url/$basename' > /dev/null") == 0 or "'$nararchive' '$archives_put_url/$basename' > /dev/null") == 0 or
die "curl failed on $nararchive: $?"; die "curl failed on $nararchive: $?";
} }