From: Ralph Hempel Date: Tue, 18 Mar 2008 21:07:22 +0000 (+0000) Subject: adding the possibility of local file cache specify file://path_to_file_cache within... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c15ca4fb8040766e683bf33ad389c32cecb03a1f;p=openwrt%2Fstaging%2Fdangole.git 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 --- diff --git a/scripts/download.pl b/scripts/download.pl index e885ff25f5..38adb012cc 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -20,8 +20,8 @@ my @mirrors; my $ok; sub localmirrors { - my @mlist; - open LM, "$scriptdir/localmirrors" and do { + my @mlist; + open LM, "$scriptdir/localmirrors" and do { while () { chomp $_; push @mlist, $_; @@ -37,9 +37,8 @@ sub localmirrors { } close CONFIG; }; - - return @mlist; + return @mlist; } sub which($) { @@ -61,36 +60,45 @@ sub download my $mirror = shift; my $options = $ENV{WGET_OPTIONS}; $options or $options = ""; - + $mirror =~ s/\/$//; - 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; + if( $mirror =~ /^file:\/\// ) { + my $cache = $mirror; + $cache =~ s/file:\/\///g; + print "Checking local cache: $cache\n"; + system("mkdir -p $target/"); + system("cp -f $cache/$filename $target/$filename.dl") == 0 or return; + 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; + } } - + my $sum = `cat "$target/$filename.md5sum"`; $sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n"; $sum = $1; - + 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"; cleanup(); return; } - + unlink "$target/$filename"; system("mv \"$target/$filename.dl\" \"$target/$filename\""); cleanup(); @@ -140,7 +148,7 @@ push @mirrors, 'http://downloads.openwrt.org/sources'; while (!$ok) { my $mirror = shift @mirrors; $mirror or die "No more mirrors to try - giving up.\n"; - + download($mirror); -f "$target/$filename" and $ok = 1; }