about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/download-from-binary-cache.pl.in2
-rwxr-xr-xscripts/download-using-manifests.pl.in10
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in
index f49f246613a0..751623eebf2e 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -508,7 +508,7 @@ sub downloadBinary {
             next;
         }
         my $url = "$cache->{url}/$info->{url}"; # FIXME: handle non-relative URLs
-        print STDERR "\n*** Downloading ‘$url’ into ‘$storePath’...\n";
+        print STDERR "\n*** Downloading ‘$url’ to ‘$storePath’...\n";
         Nix::Utils::checkURL $url;
         if (system("$Nix::Config::curl --fail --location --insecure '$url' | $decompressor | $Nix::Config::binDir/nix-store --restore $storePath") != 0) {
             die "download of `$info->{url}' failed" . ($! ? ": $!" : "") . "\n" unless $? == 0;
diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in
index 7a76076d7a80..8f66a292e361 100755
--- a/scripts/download-using-manifests.pl.in
+++ b/scripts/download-using-manifests.pl.in
@@ -325,7 +325,7 @@ while (scalar @path > 0) {
             # into the target path.
             print STDERR "  unpacking patched archive...\n";
             system("$Nix::Config::binDir/nix-store --restore $v < $tmpNar2") == 0
-                or die "cannot unpack $tmpNar2 into `$v'\n";
+                or die "cannot unpack $tmpNar2 to `$v'\n";
         }
 
         $finalNarHash = $patch->{narHash};
@@ -333,7 +333,7 @@ while (scalar @path > 0) {
 
     elsif ($edge->{type} eq "narfile") {
         my $narFile = $edge->{info};
-        print STDERR "downloading `$narFile->{url}' into `$v'\n";
+        print STDERR "downloading `$narFile->{url}' to `$v'\n";
 
         my $size = $narFile->{size} || -1;
         print LOGFILE "$$ narfile $narFile->{url} $size $v\n";
@@ -348,11 +348,11 @@ while (scalar @path > 0) {
         if ($curStep < $maxStep) {
             # The archive will be used a base to a patch.
             system("$curl '$narFile->{url}' | $decompressor > $tmpNar") == 0
-                or die "cannot download and unpack `$narFile->{url}' into `$v'\n";
+                or die "cannot download and unpack `$narFile->{url}' to `$v'\n";
         } else {
-            # Unpack the archive into the target path.
+            # Unpack the archive to the target path.
             system("$curl '$narFile->{url}' | $decompressor | $Nix::Config::binDir/nix-store --restore '$v'") == 0
-                or die "cannot download and unpack `$narFile->{url}' into `$v'\n";
+                or die "cannot download and unpack `$narFile->{url}' to `$v'\n";
         }
 
         $finalNarHash = $narFile->{narHash};