max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Style fix

Browse source
This commit is contained in:
Eelco Dolstra 2012-09-21 15:02:33 -04:00
parent 20582e9ae3
commit c1f91570b3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/download-from-binary-cache.pl.in
View file

@ -508,7 +508,7 @@ sub downloadBinary {
next; next;
} }
my $url = "$cache->{url}/$info->{url}"; # FIXME: handle non-relative URLs 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; Nix::Utils::checkURL $url;
if (system("$Nix::Config::curl --fail --location --insecure '$url' | $decompressor | $Nix::Config::binDir/nix-store --restore $storePath") != 0) { 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; die "download of `$info->{url}' failed" . ($! ? ": $!" : "") . "\n" unless $? == 0;

10
scripts/download-using-manifests.pl.in
View file

@ -325,7 +325,7 @@ while (scalar @path > 0) {
# into the target path. # into the target path.
print STDERR " unpacking patched archive...\n"; print STDERR " unpacking patched archive...\n";
system("$Nix::Config::binDir/nix-store --restore $v < $tmpNar2") == 0 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}; $finalNarHash = $patch->{narHash};
@ -333,7 +333,7 @@ while (scalar @path > 0) {
elsif ($edge->{type} eq "narfile") { elsif ($edge->{type} eq "narfile") {
my $narFile = $edge->{info}; 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; my $size = $narFile->{size} || -1;
print LOGFILE "$$ narfile $narFile->{url} $size $v\n"; print LOGFILE "$$ narfile $narFile->{url} $size $v\n";
@ -348,11 +348,11 @@ while (scalar @path > 0) {
if ($curStep < $maxStep) { if ($curStep < $maxStep) {
# The archive will be used a base to a patch. # The archive will be used a base to a patch.
system("$curl '$narFile->{url}' | $decompressor > $tmpNar") == 0 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 { } 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 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}; $finalNarHash = $narFile->{narHash};