From 9a404e45c9e8257e2d353d569e189a4b003159b5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Jan 2004 14:20:33 +0000 Subject: [PATCH] * Synchronous `nix-pull' with `nix-push'. * Use curl instead of wget. --- scripts/nix-pull.in | 2 +- scripts/nix-push.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index f0d5d95f2..2b2d4e857 100644 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -64,7 +64,7 @@ $fullexpr .= "]"; # 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"; print WRITE $fullexpr; diff --git a/scripts/nix-push.in b/scripts/nix-push.in index 20883e011..1e1d905ed 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -159,7 +159,7 @@ foreach my $nararchive (@nararchives) { if (system("$curl --head $archives_get_url/$basename > /dev/null") != 0) { 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 die "curl failed on $nararchive: $?"; }