adding the possibility of local file cache specify file://path_to_file_cache within localmirrors file to add new local file cache
SVN-Revision: 10617
This commit is contained in:
parent
03261ab3a0
commit
c15ca4fb80
|
@ -20,8 +20,8 @@ my @mirrors;
|
||||||
my $ok;
|
my $ok;
|
||||||
|
|
||||||
sub localmirrors {
|
sub localmirrors {
|
||||||
my @mlist;
|
my @mlist;
|
||||||
open LM, "$scriptdir/localmirrors" and do {
|
open LM, "$scriptdir/localmirrors" and do {
|
||||||
while (<LM>) {
|
while (<LM>) {
|
||||||
chomp $_;
|
chomp $_;
|
||||||
push @mlist, $_;
|
push @mlist, $_;
|
||||||
|
@ -37,9 +37,8 @@ sub localmirrors {
|
||||||
}
|
}
|
||||||
close CONFIG;
|
close CONFIG;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
return @mlist;
|
return @mlist;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub which($) {
|
sub which($) {
|
||||||
|
@ -61,36 +60,45 @@ sub download
|
||||||
my $mirror = shift;
|
my $mirror = shift;
|
||||||
my $options = $ENV{WGET_OPTIONS};
|
my $options = $ENV{WGET_OPTIONS};
|
||||||
$options or $options = "";
|
$options or $options = "";
|
||||||
|
|
||||||
$mirror =~ s/\/$//;
|
$mirror =~ s/\/$//;
|
||||||
open WGET, "wget -t5 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
|
if( $mirror =~ /^file:\/\// ) {
|
||||||
open MD5SUM, "| $md5cmd > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
|
my $cache = $mirror;
|
||||||
open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
|
$cache =~ s/file:\/\///g;
|
||||||
my $buffer;
|
print "Checking local cache: $cache\n";
|
||||||
while (read WGET, $buffer, 1048576) {
|
system("mkdir -p $target/");
|
||||||
print MD5SUM $buffer;
|
system("cp -f $cache/$filename $target/$filename.dl") == 0 or return;
|
||||||
print OUTPUT $buffer;
|
system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return;
|
||||||
|
} else {
|
||||||
|
open WGET, "wget -t5 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
|
||||||
|
open MD5SUM, "| $md5cmd > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
|
||||||
|
open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
|
||||||
|
my $buffer;
|
||||||
|
while (read WGET, $buffer, 1048576) {
|
||||||
|
print MD5SUM $buffer;
|
||||||
|
print OUTPUT $buffer;
|
||||||
|
}
|
||||||
|
close MD5SUM;
|
||||||
|
close WGET;
|
||||||
|
close OUTPUT;
|
||||||
|
|
||||||
|
if (($? >> 8) != 0 ) {
|
||||||
|
print STDERR "Download failed.\n";
|
||||||
|
cleanup();
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
close MD5SUM;
|
|
||||||
close WGET;
|
|
||||||
close OUTPUT;
|
|
||||||
|
|
||||||
if (($? >> 8) != 0 ) {
|
|
||||||
print STDERR "Download failed.\n";
|
|
||||||
cleanup();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
my $sum = `cat "$target/$filename.md5sum"`;
|
my $sum = `cat "$target/$filename.md5sum"`;
|
||||||
$sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
|
$sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
|
||||||
$sum = $1;
|
$sum = $1;
|
||||||
|
|
||||||
if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
|
if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
|
||||||
print STDERR "MD5 sum of the downloaded file does not match (file: $sum, requested: $md5sum) - deleting download.\n";
|
print STDERR "MD5 sum of the downloaded file does not match (file: $sum, requested: $md5sum) - deleting download.\n";
|
||||||
cleanup();
|
cleanup();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
unlink "$target/$filename";
|
unlink "$target/$filename";
|
||||||
system("mv \"$target/$filename.dl\" \"$target/$filename\"");
|
system("mv \"$target/$filename.dl\" \"$target/$filename\"");
|
||||||
cleanup();
|
cleanup();
|
||||||
|
@ -140,7 +148,7 @@ push @mirrors, 'http://downloads.openwrt.org/sources';
|
||||||
while (!$ok) {
|
while (!$ok) {
|
||||||
my $mirror = shift @mirrors;
|
my $mirror = shift @mirrors;
|
||||||
$mirror or die "No more mirrors to try - giving up.\n";
|
$mirror or die "No more mirrors to try - giving up.\n";
|
||||||
|
|
||||||
download($mirror);
|
download($mirror);
|
||||||
-f "$target/$filename" and $ok = 1;
|
-f "$target/$filename" and $ok = 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue