about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-01-14T14·20+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-01-14T14·20+0000
commit9a404e45c9e8257e2d353d569e189a4b003159b5 (patch)
tree7b3ec585266da60ccff35d38f7fe3ed7410088fa
parent16f9b133ec8c1fc6226d486e5170dd3a43aa35a7 (diff)
* Synchronous `nix-pull' with `nix-push'.
* Use curl instead of wget.

-rw-r--r--scripts/nix-pull.in2
-rw-r--r--scripts/nix-push.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in
index f0d5d95f2581..2b2d4e857ab5 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 20883e01159b..1e1d905edcbe 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: $?";
     }